[Cosmo-dev] 0.6.1 -> trunk merge details

[Travis Vachon]

Hi folks

Because we have decided to move 0.6.1 work to the trunk,  
"0.6.1" (that is, the head of trunk) now has some additional work  
from the past couple months.

Off the top of my head, this work includes:
    * New button styling
    * Password recovery workflow (complete except for UI, which  
should be pretty minimal)
    * Windmill
    * Assorted bug fixes

A couple questions this raises:

1) Do we need to go through the list of commits to trunk and modify  
the corresponding bugzilla entries accordingly in for the purposes of  
QA?
2) Should we include these features in the list of 0.6.1 features  
when we release? (if so, 1 is probably a yes, correct?)
3) What other side effects does this have?

One reasonably major side effect I can think of is related to bug 8460:
https://bugzilla.osafoundation.org/show_bug.cgi?id=8460

Since the "forgot password" model work is now part of 0.6.1, we'll  
need additional migration script work, I believe. Fortunately, I  
think this should be reasonably simple, since all we need is a single  
additional database table.

Thoughts?

-Travis