~launchpad-pqm/launchpad/devel

merge from rf
Patches applied:

 * andrew.bennetts@canonical.com/launchpad--librarian-smallfixes--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1756

 * andrew.bennetts@canonical.com/launchpad--librarian-smallfixes--0--patch-1
   Assert that the declared size matches the number of bytes sent.

 * andrew.bennetts@canonical.com/launchpad--librarian-smallfixes--0--patch-2
   Tweaks in response to review.

 * andrew.bennetts@canonical.com/launchpad--librarian-smallfixes--0--patch-3
   Update doctest to expect UploadFailed rather than ValueError.

 * andrew.bennetts@canonical.com/launchpad--librarian-smallfixes--0--patch-4
   Actually use the right exceptions in the doctest and in addFile.

 * andrew.bennetts@canonical.com/launchpad--sqlobject-0-6-1-compat--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1579

 * andrew.bennetts@canonical.com/launchpad--sqlobject-0-6-1-compat--0--patch-1
   Replace 'NOW' with UTC_NOW where appropriate, improve UTC_NOW, tweak test output for slightly different SQL quoting.

 * andrew.bennetts@canonical.com/launchpad--sqlobject-0-6-1-compat--0--patch-2
   Merge from rocketfuel, resolving conflicts.

 * andrew.bennetts@canonical.com/launchpad--sqlobject-0-6-1-compat--0--patch-3
   Fix some test failures.

 * andrew.bennetts@canonical.com/launchpad--sqlobject-0-6-1-compat--0--patch-4
   Use new IntervalCol for Bounty.duration.

 * andrew.bennetts@canonical.com/launchpad--sqlobject-0-6-1-compat--0--patch-5
   Tweak a bounty pagetest's output to make it pass with IntervalCol.

 * andrew.bennetts@canonical.com/launchpad--sqlobject-0-6-1-compat--0--patch-6
   Merge from rocketfuel

 * andrew.bennetts@canonical.com/launchpad--sqlobject-0-6-1-compat--0--patch-7
   Merge from rocketfuel

 * andrew.bennetts@canonical.com/launchpad--sqlobject-0-6-1-compat--0--patch-8
   Replace more literal 'NOW' with UTC_NOW

 * bjorn.tillenius@canonical.com/launchpad--security-policies-for-scripts--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1781

 * bjorn.tillenius@canonical.com/launchpad--security-policies-for-scripts--0--patch-1
   make it possible for scripts to use the web app's security policy.

 * bjorn.tillenius@canonical.com/launchpad--trivial-fixes--0--patch-3
   merge rf

 * bjorn.tillenius@canonical.com/launchpad--trivial-fixes--0--patch-4
   remove 'Please select the distribution in which you want to file a bug.' from view distribution bugs page.

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-524
   merge from rf

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-525
   fix https://launchpad.ubuntu.com/malone/bugs/204

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-526
   fix https://launchpad.ubuntu.com/malone/bugs/547

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-527
   add a little black box for bug task absolute URLs and fix https://launchpad.ubuntu.com/malone/bugs/638

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-528
   merge from rf

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-529
   small fixes/cleanup

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-530
   merge from rf

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-531
   merge from rf

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-532
   fix method typo which caused exceptions to be raised

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-533
   anonymous login cleanup in system doc doctests.

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-534
   merge from rf

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-535
   response to code review

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-536
   merge from rf

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-537
   small wording change for dup notice

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-538
   small dups test fix

 * brad.bollenbach@canonical.com/launchpad--devel--0--patch-539
   merge from rf

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-28
   Merge from Rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-29
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-30
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-31
   Check if a POTemplate exists in a previous distrorelease before creating a new one.

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-32
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-33
   Updated the form to edit the PO Template fields

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-34
   Added an admin page for POTemplate objects so we don't need Stub's DB interface

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-35
   Added an admin page for POTemplate objects so we don't need Stub's DB interface

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-36
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-37
   Finished the implementation and added tests

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-38
   Renamed ViewPOTemplate to POTemplateView and readded the upload form

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-39
   Fixed a test

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-40
   Fixed the acls to edit POTemplate details

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-41
   Applied UI changes suggested by mpt and fixed tests

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-42
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-43
   Second review fixes from mpt

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-44
   Added a form to create new PO Templates inside a product release and added links to improve the navigation to reach the forms.

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-45
   Test fixes and new files added

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-46
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-47
   Applied changes after jamesh review

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-48
   last comments from mpt

 * carlos.perello@canonical.com--2004/launchpad--LaunchpadPackagePoAttach--0--patch-49
   Stupid change

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-623
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-624
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-625
   Forgot a title for the upload form, and the submit URL was wrong...

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-626
   Trivial fix and pagetest added

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-627
   Fixed a stupid cut&paste error

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-628
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--devel--0--patch-629
   Updated a pagetest and updated sample data

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--base-0
   tag of mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-41

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-1
   Fixed a security bug in our translation forms and small improvements

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-2
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-3
   Small clean ups and fixed another security bug while removing a translation group member

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-4
   Improved some portlets

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-5
   Fixed tests

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-6
   Applied small changes from spiv's review

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-7
   Merge from mark's branch

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-8
   More changes from spiv's comments

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-9
   Merge from rocketfuel

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-10
   Stupid typo

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-11
   Fixed a bad conflict resolution with bug-index.pt

 * carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-12
   Added data migration

 * daf@canonical.com--2004/launchpad--devel--0--patch-454
   merge from rocketfuel

 * daf@canonical.com--2004/launchpad--devel--0--patch-455
   don't repeat missing distribution/release errors

 * daf@canonical.com--2004/launchpad--devel--0--patch-456
   fix PO export adapters

 * daf@canonical.com--2004/launchpad--devel--0--patch-457
   make DistroRelease.datereleased nullable via SQLObject

 * daf@canonical.com--2004/launchpad--devel--0--patch-458
   clean up use of login/ANONYMOUS in page tests

 * daf@canonical.com--2004/launchpad--devel--0--patch-459
   fix tests I broke earlier

 * daniel.silverstone@canonical.com--laptop/launchpad--buildd--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1756

 * daniel.silverstone@canonical.com--laptop/launchpad--buildd--0--patch-1
   Trivial port to the new librarian api

 * daniel.silverstone@canonical.com--laptop/launchpad--sqlbits--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1744

 * daniel.silverstone@canonical.com--laptop/launchpad--sqlbits--0--patch-1
   SQL patch, comments etc for Soyuz 1.0 stuff

 * daniel.silverstone@canonical.com--laptop/launchpad--sqlbits--0--patch-2
   SQLObject changes and a teeny typo fix in the sql patch

 * daniel.silverstone@canonical.com--laptop/launchpad--sqlbits--0--patch-3
   Fix up a broken docstring

 * daniel.silverstone@canonical.com--laptop/launchpad--sqlbits--0--patch-4
   Merge tweaks and blessing from stuart

 * daniel.silverstone@canonical.com--laptop/launchpad--sqlbits--0--patch-5
   Merge tweaks and blessing from stuart with the right patch number this time

 * daniel.silverstone@canonical.com--laptop/launchpad--sqlbits--0--patch-6
   Star-merge rocketfuel and resolve security.cfg conflict

 * daniel.silverstone@canonical.com--laptop/launchpad--sqlbits--0--patch-7
   Respond to microreview from stevea

 * david.allouche@canonical.com--2004/buildbot--devel--0--patch-180
   merge rocketfuel

 * david.allouche@canonical.com--2004/buildbot--devel--0--patch-181
   [merge] configurable runner_path

 * david.allouche@canonical.com--2004/buildbot--devel--0--patch-182
   [merge] set runner_path before adding steps

 * david.allouche@canonical.com--2004/buildbot--devel--0--patch-183
   merge rocketfuel

 * david.allouche@canonical.com--2004/buildbot--devel--0--patch-184
   missing "import SCM" in JobStrategy.py

 * guilherme.salgado@canonical.com/launchpad--forgottenpassword-link--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1777

 * guilherme.salgado@canonical.com/launchpad--forgottenpassword-link--0--patch-1
   Use absolute path to link to the +forgottenpassword page.  Fix #718.

 * guilherme.salgado@canonical.com/launchpad--mpt-projects--0--base-0
   tag of mpt@canonical.com/launchpad--projects-index--0--patch-1

 * guilherme.salgado@canonical.com/launchpad--mpt-projects--0--patch-1
   filling fixmes

 * guilherme.salgado@canonical.com/launchpad--pythonpath--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1751

 * guilherme.salgado@canonical.com/launchpad--pythonpath--0--patch-1
   Always use sys.path.insert() instead of sys.path.append() to give precedence for launchpad libs that are inside our tree.

 * guilherme.salgado@canonical.com/launchpad--smallfixes--0--patch-13
   Cleanup of browser code related to joininig/leaving teams.

 * guilherme.salgado@canonical.com/launchpad--smallfixes--0--patch-14
   merge from rf

 * guilherme.salgado@canonical.com/launchpad--smallfixes--0--patch-15
   small wording fixes

 * guilherme.salgado@canonical.com/launchpad--use-browsername--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1777

 * guilherme.salgado@canonical.com/launchpad--use-browsername--0--patch-1
   Fix some templates that were accessing only the Person's displayname; not other displaynames, like product.

 * guilherme.salgado@canonical.com/launchpad--use-browsername--0--patch-2
   Finish replacing person.displayname by person.browsername in page templates.

 * guilherme.salgado@canonical.com/launchpad--use-browsername--0--patch-3
   small fix requested by steve.

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1619

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-1
   commit the first part of the timezone awareness code

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-2
   change some more code to use UTC_NOW

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-3
   add timezone stuff in tree

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-4
   merge from rocketfuel, fix conflicts

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-5
   update UtcDateTimeValidator logic

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-6
   merge from rocketfuel

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-7
   merge from rocketfuel

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-8
   change pytz symlink to point at the right location

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-9
   partial fix for poexport doctest

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-10
   alter file sizes in doctest to handle change in datetime representation

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-11
   merge from rocketfuel

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-12
   fix a few problems caused by last merge

 * james.henstridge@canonical.com--2004/launchpad--TimezoneHandling--0--patch-13
   add comments suggested by Andrew

 * mark.shuttleworth@canonical.com/launchpad--devel--0--patch-963
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--base-0
   tag of mark.shuttleworth@canonical.com/launchpad--devel--0--patch-963

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-1
   initial translation group db and presentation work

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-2
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-3
   bring up translator db classes

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-4
   further work trying to get a good autogenerated form to add a translator

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-5
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-6
   adding a translator to a translation group now works

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-7
   setup traversal from translationgroup to translator

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-8
   very nice translator addition and removal interaction

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-9
   fixes and removing pdb trace

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-10
   fixes to the sql and page templates

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-11
   preventative maintainance on the bug page

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-12
   show translation groups in distro, product and project portlets. bug tweaks too.

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-13
   page tweaks

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-14
   enable selection of translation group on distro, product and project

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-15
   test fixes and page tweaks-and-polish

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-16
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-17
   portlet tweaks

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-18
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-19
   merge db tweaks from stub

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-20
   add a dbschema for group translation permission system

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-21
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-22
   add new translationpermission enum with comments for (r=stub)

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-23
   rid the world of sourcesource, permanently

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-24
   really really terminate sourcesource

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-25
   fix small bug in database/project.py

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-26
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-27
   display translators in pofile and potemplate portlets

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-28
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-29
   improve portlet to show contributors

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-30
   fixup rosetta portlets

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-31
   clean up potemplate view and portlets

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-32
   tweaks for tests

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-33
   more test tweaks

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-34
   branch portlet cleanup

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-35
   remove 'managed' option for translation permissions until we have better edit support

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-36
   merge rocketfuel, resolving conflicts

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-37
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-38
   clean up bug page further

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-39
   restore the bug summary

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-40
   portlet cleanups and improvements and additions

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-41
   merge rocketfuel, resolving conflicts

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-42
   merge from carlos

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-43
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-44
   merge from carlos

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-45
   initial suggestions implementation

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-46
   polish the 'suggested text' code a little

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-47
   clean up selection of suggested alternative translations

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-48
   add some tests of new suggestions framework

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-49
   merge rocketfuel

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-50
   merge from carlos

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-51
   add tests for translation group pages

 * mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-52
   fix test

 * morgan.collett@canonical.com/launchpad--devel2005--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1578

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-1
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-2
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-3
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-4
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-5
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-6
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-7
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-8
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-9
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-10
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-11
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-12
   Merge from RF

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-13
   Merge from RF

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-14
   Add valid_name validator for product name

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-15
   Add product +review link to actions portlet

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-16
   Change default value for arch archive from @products.ubuntu.com to @bazaar.ubuntu.com

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-17
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-18
   Fix bug 822: sourcepackage link to productseries missing +series

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-19
   Make links to +review pages for project and product from +sourceadmin

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-20
   Bug 689: cvs details vanish from +sourceadmin if arch details bad

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-21
   merge rocketfuel

 * morgan.collett@canonical.com/launchpad--devel2005--0--patch-22
   Bug 706: Stop +sourceadmin complaining about empty cvs details when adding arch branch data for tarball imports

 * morgan.collett@canonical.com/launchpad--production-bug-554--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1713

 * morgan.collett@canonical.com/launchpad--production-bug-554--0--patch-1
   Reorder fields in product +edit page, add programminglang to product +new page

 * morgan.collett@canonical.com/launchpad--production-bug-554--0--patch-2
   Add programminglang, increase widget size to project +newproduct

 * morgan.collett@canonical.com/launchpad--production-bug-554--0--patch-3
   Merge from RF

 * morgan.collett@canonical.com/launchpad--production-bug-713--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1741

 * morgan.collett@canonical.com/launchpad--production-bug-713--0--patch-1
   Merge from RF

 * morgan.collett@canonical.com/launchpad--production-bug-713--0--patch-2
   Allow releaseroot to stay blank when series +edited

 * mpt@canonical.com/launchpad--addform-and-editform--0--base-0
   tag of mpt@canonical.com/launchpad--devel--0--patch-58

 * mpt@canonical.com/launchpad--addform-and-editform--0--patch-1
   remove redundant <legend>s

 * mpt@canonical.com/launchpad--addform-and-editform--0--patch-2
   restore mistakenly deleted file, and fix pagetest

 * mpt@canonical.com/launchpad--addform-and-editform--0--patch-3
   merge rocketfuel, resolve conflict

 * mpt@canonical.com/launchpad--addform-and-editform--0--patch-4
   fix from jamesh's review

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--base-0
   tag of mpt@canonical.com/launchpad--devel--0--patch-44

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-1
   clean up bug task page

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-2
   merge rocketfuel and fix most pagetests

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-3
   remove refuel change that doesn't belong in this branch

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-4
   fix code and doctests as requested by SteveA

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-5
   review fixes; add more tests (incomplete)

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-6
   merge rocketfuel, fix conflict, stub out unimplemented pagetests

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-7
   merge rocketfuel + retreat doctests + review fixes

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-8
   merge rocketfuel

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-9
   merge rocketfuel, resolve conflicts, and put task-specific info at top

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-10
   fix pagetests

 * mpt@canonical.com/launchpad--bugtask-cleanup--0--patch-11
   merge rocketfuel, resolve conflicts from LaunchpadTitles

 * mpt@canonical.com/launchpad--devel--0--patch-56
   merge rocketfuel

 * mpt@canonical.com/launchpad--devel--0--patch-57
   merge rocketfuel

 * mpt@canonical.com/launchpad--devel--0--patch-58
   [trivial] fix colspan='3' error in bugtask search listings

 * mpt@canonical.com/launchpad--devel--0--patch-59
   resolve conflict

 * mpt@canonical.com/launchpad--projects-index--0--base-0
   tag of mpt@canonical.com/launchpad--devel--0--patch-46

 * mpt@canonical.com/launchpad--projects-index--0--patch-1
   clean up projects index page

 * mpt@canonical.com/launchpad--projects-index--0--patch-2
   up to date

 * mpt@canonical.com/launchpad--projects-index--0--patch-3
   resolve phantom conflicts

 * mpt@canonical.com/launchpad--projects-index--0--patch-4
   resolve phantom conflicts (2nd mirror attempt)

 * mpt@canonical.com/launchpad--projects-index--0--patch-5
   incorporate salgado's changes

 * mpt@canonical.com/launchpad--projects-index--0--patch-6
   merge rocketfuel

 * mpt@canonical.com/launchpad--projects-index--0--patch-7
   fixing merge conflicts...

 * mpt@canonical.com/launchpad--projects-index--0--patch-8
   ... fixing merge conflicts ...

 * mpt@canonical.com/launchpad--projects-index--0--patch-9
   ... finish fixing conflicts

 * mpt@canonical.com/launchpad--projects-index--0--patch-10
   merge rocketfuel, fix conflict

 * robert.collins@canonical.com/launchpad--move-importd-to-lp--0--base-0
   tag of robert.collins@canonical.com/launchpad--devel--0--patch-129

 * robert.collins@canonical.com/launchpad--move-importd-to-lp--0--patch-1
   move importd code from buildbots tree to launchpad

 * robert.collins@canonical.com/launchpad--move-importd-to-lp--0--patch-2
   merge from rf

 * robert.collins@canonical.com/launchpad--move-importd-to-lp--0--patch-3
   catch up with buildbot

 * robert.collins@canonical.com/launchpad--move-importd-to-lp--0--patch-4
   add preexisting tags from moved files, tags are required at this point to sync up outstanding patchs correctly

 * robert.collins@canonical.com/launchpad--move-importd-to-lp--0--patch-5
   tests update

 * rocketfuel@canonical.com/buildbot--devel--0--patch-154
   [trivial] missing "import SCM" in JobStrategy.py

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1743
   one urgent fix. some non-urgent fixes. some code cleanup. [r=SteveA]

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1744
   [trivial] tweak fix of colspan='3' bug to match fix already on production, preventing future conflicts

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1745
   r=spiv.  Clean up the /projects page.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1746
   [trivial] various fixes that didn't merge before (network?) and new db diagrams

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1747
   tweak LaunchpadPackagePoAttach logging [trivial]

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1748
   [trivial] Production bugs 554, 690 - product +add and +edit pages have fields in different orders, one lacks programminglang

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1749
   tweak LaunchpadPackagePoAttach logging [trivial]

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1750
   small wording change for dup notice + test fix [trivial]

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1751
   fix PO export adapters [trivial]

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1752
   [r=jamesh] database log watch script'n'framework

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1753
   r=jamesh. Small changes to make Launchpad work with SQLObject 0.6.1

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1754
   [r=spiv] Run Librarian on launchpad startup if requested

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1755
   declare DistroRelease.datereleased as nullable, clean up use of login/ANONYMOUS in page tests [trivial]

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1756
   [r=jamesh] Password Change Widget

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1757
   [trivial] Production bugs 713, 748: Product series edit failing silently due to blank releaseroot URL

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1758
   [trivial] Cope with existing data in db patch

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1759
   PoTemplateAdmin implementation (finally) r=jamesh,mpt

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1760
   Introduce a new somelist/count:len tales addition. r=jamesh

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1761
   [trivial] Update buildd slave to new librarian API

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1762
   mpt's bugtask-cleanup with a test from steve. r=stevea

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1763
   SQL changes related to builders and chroots, for Soyuz 1.0 r=stevea,stub

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1764
   [trivial] Add Build to the Soyuz diagram to make link between BinaryPackage and SourcePackageRelease clear

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1765
   [trivial] Production Bug 811: Add product name validator

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1766
   [trivial] Bug 825: Add product +review link to actions portlet

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1767
   [r=jamesh] clean up addform, editform, and the templates that use them

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1768
   [trivial] Stupid typos fixed and added a pagetest for the potemplate upload form

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1769
   remove __len__ and python:len(...) from page templates.  replace with count:len. r=stub

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1770
   [trivial] Bug 703: Change default value for arch archive to @bazaar.ubuntu.com

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1771
   stop zcmlforscripts spewing crap when the process exits [trivial]

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1772
   Fixed production bug #760 + pagetest

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1773
   [trivial] Bug 822: Sourcepackage page link to productseries missing +series

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1774
   [trivial] Make links to +review pages for project and product from +sourceadmin

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1775
   Bug 689: cvs details vanish from +sourceadmin if arch details bad

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1776
   Always use sys.path.insert instead of sys.path.append to give precedence for launchpad libs that are inside our tree. r=stub

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1777
   Bug 706: Stop +sourceadmin complaining about empty cvs details when adding arch branch data for tarball imports

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1778
   Use absolute paths when referring to the +forgottenpassword page. Fix #718. [trivial]

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1779
   merge TimezoneHandling, r=spiv

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1780
   move importd code from buildbots tree to launchpad

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1781
   Use IPerson.browsername instead of IPerson.displayname in all page templates.

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1782
   [trivial] Create admin and read groups automatically

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1783
   [trivial] Specify config section using LPCONFIG

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1784
   Cleanup of browser code related to joininig/leaving teams. r=SteveA

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1785
   make it possible for scripts to use the web app's security policy. r=stevea

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1786
   remove 'Please select the distribution in which you want to file a bug.' from view distribution bugs page. [trivial]

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1787
   Add an assertion to catch mismatches between stated file size and bytes read, avoiding a hang. r=SteveA

 * rocketfuel@canonical.com/launchpad--devel--0--patch-1788
   [r=spiv] teams of translators to be organised as groups by language

 * steve.alexander@canonical.com/launchpad--bugtask-cleanup--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1757

 * steve.alexander@canonical.com/launchpad--bugtask-cleanup--0--patch-1
   merge from mpt's branch, resolving conflict.

 * steve.alexander@canonical.com/launchpad--bugtask-cleanup--0--patch-2
   changed docstring in bugtask.py, and wrote more complete test for bugtask.contextname.

 * steve.alexander@canonical.com/launchpad--clean-len-in-pagetemplates--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1759

 * steve.alexander@canonical.com/launchpad--clean-len-in-pagetemplates--0--patch-1
   merge fom rf to receive count:len

 * steve.alexander@canonical.com/launchpad--clean-len-in-pagetemplates--0--patch-2
   Made count:len work for all objects that can support it.  Converted page templates to use it.

 * steve.alexander@canonical.com/launchpad--clean-len-in-pagetemplates--0--patch-3
   turn back on chunky diff after i accidentally turned it of on this branch.

 * steve.alexander@canonical.com/launchpad--clean-len-in-pagetemplates--0--patch-4
   merge from rf, resolved conflicts

 * steve.alexander@canonical.com/launchpad--clean-len-in-pagetemplates--0--patch-5
   correctly use latest bugtask-editform.pt from RF.

 * steve.alexander@canonical.com/launchpad--tales-len--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1756

 * steve.alexander@canonical.com/launchpad--tales-len--0--patch-1
   Implemented foo/count:len that gives you the length of dicts, tuples, lists and SelectResults from page templates.

 * steve.alexander@canonical.com/launchpad--tales-len--0--patch-2
   added clarification to tales.txt that count:len is not available for just any object that provides __len__.

 * steve.alexander@canonical.com/launchpad--zcmlforscripts--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1770

 * steve.alexander@canonical.com/launchpad--zcmlforscripts--0--patch-1
   add atexit handler that kills off mail delivery thread daemons, to shut up silly spew at python exit.

 * stuart.bishop@canonical.com/launchpad--autolibrarian--0--base-0
   tag of stuart.bishop@canonical.com/launchpad--devel--2--patch-21

 * stuart.bishop@canonical.com/launchpad--autolibrarian--0--patch-1
   Make runlaunchpad.py launch a local Librarian if config option is set

 * stuart.bishop@canonical.com/launchpad--autolibrarian--0--patch-2
   Integrate review feedback from spiv

 * stuart.bishop@canonical.com/launchpad--autolibrarian--0--patch-3
   Merge from Rocketfuel

 * stuart.bishop@canonical.com/launchpad--carlos--3--base-0
   tag of carlos.perello@canonical.com--2004/launchpad--translationgroups--0--patch-12

 * stuart.bishop@canonical.com/launchpad--carlos--3--patch-1
   Make database building fail if a patch fails to be applied

 * stuart.bishop@canonical.com/launchpad--carlos--3--patch-2
   Stop importdcheck failing by ensuring database is current before running tests

 * stuart.bishop@canonical.com/launchpad--changepassword--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1720

 * stuart.bishop@canonical.com/launchpad--changepassword--0--patch-1
   Password change widget looking for a form to test it with

 * stuart.bishop@canonical.com/launchpad--changepassword--0--patch-2
   Add a person/+review page and fixes to PasswordChangeWidget

 * stuart.bishop@canonical.com/launchpad--changepassword--0--patch-3
   Fix tests

 * stuart.bishop@canonical.com/launchpad--changepassword--0--patch-4
   Make PasswordChangeWidget handle no input as 'use existing value'

 * stuart.bishop@canonical.com/launchpad--changepassword--0--patch-5
   Make makepagetest.py use debug skin so we can hit /+basicauth.

 * stuart.bishop@canonical.com/launchpad--changepassword--0--patch-6
   Add pagetest for +review page

 * stuart.bishop@canonical.com/launchpad--changepassword--0--patch-7
   Reviewer feedback and fix page tests

 * stuart.bishop@canonical.com/launchpad--dba--1--patch-2
   Update database schema docs to reality

 * stuart.bishop@canonical.com/launchpad--dba--1--patch-3
   Add initial sourcerer permissions and account to security.cfg for further tweakage

 * stuart.bishop@canonical.com/launchpad--dba--1--patch-4
   Initial cut at performance monitoring tool

 * stuart.bishop@canonical.com/launchpad--dba--1--patch-5
   Merge from Rocketfuel

 * stuart.bishop@canonical.com/launchpad--dba--1--patch-6
   Merge from Rocketfuel

 * stuart.bishop@canonical.com/launchpad--dba--1--patch-7
   Regenerate database documentation

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-15
   Merge from Rocketfuel

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-16
   Add DB constraint enforcing only one preferred email address

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-17
   Add DB constraints to enforce teams don't get invalid fields set

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-18
   There can be only one PREFERRED email

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-19
   Flag another UNIQUE index person merge should ignore

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-20
   Add flush_database_updates call to enforce order of operations so SQLObject doesn't blow up the UNIQUE index

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-21
   Put chunkydiff back on

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-22
   Tweak diagram config and template until db diagrams are useful

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-23
   New database diagrams

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-24
   Remove unnecessary step

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-25
   Cope with existing data in db patch

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-26
   Add Build to the Soyuz diagram to make link between BinaryPackage and SourcePackageRelease clear

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-27
   Merge from Rocketfuel

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-28
   Make security.py use correct default database

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-29
   Create admin and read groups automatically

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-30
   Emit a warning if no LPCONFIG environment variable set

 * stuart.bishop@canonical.com/launchpad--devel--2--patch-31
   Propogate use of LPCONFIG

 * stuart.bishop@canonical.com/launchpad--kinnison--3--base-0
   tag of daniel.silverstone@canonical.com--laptop/launchpad--sqlbits--0--patch-3

 * stuart.bishop@canonical.com/launchpad--kinnison--3--patch-1
   tweaks, comments and validators for dba blessing

 * stuart.bishop@canonical.com/launchpad--kinnison--3--patch-2
   Renumber Daniels patch - 13 already taken

 * stuart.bishop@canonical.com/launchpad--sabdfl--4--base-0
   tag of mark.shuttleworth@canonical.com/launchpad--translationgroups--0--patch-18

 * stuart.bishop@canonical.com/launchpad--sabdfl--4--patch-1
   Tweaks and DBA blessing