merge in 'canonical'
Patches applied:

 * alexander.limi@canonical.com--2004/canonical--devel--0--base-0
   tag of rocketfuel@canonical.com/canonical--devel--0--patch-8

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-1
   merge from rocketfuel

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-2
   merge from rocketfuel

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-3
   Moved all common resources/templates to lp/, fixed template errors

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-4
   Added launchpad templates.

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-5
   removed Launchpad index

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-6
   merge from rocketfuel

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-7
   merge from rocketfuel

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-8
   merge from rocketfuel

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-9
   Added global navigation

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-10
   Added switching Malone logo

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-11
   Added stuff to integrate with ubuntu.com

 * alexander.limi@canonical.com--2004/canonical--devel--0--patch-12
   Mailman template

 * daf@canonical.com--2004/canonical--devel--0--base-0
   tag of rocketfuel@canonical.com/canonical--devel--0--patch-3

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

 * daf@canonical.com--2004/canonical--devel--0--patch-2
   s/Soyuz/Launchpad/ in the root page

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

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

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

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

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

 * daf@canonical.com--2004/canonical--devel--0--patch-8
   add Malone to the root index

 * daf@canonical.com--2004/canonical--devel--0--patch-9
   remove redundant "application" from links in root index

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

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

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

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

 * daf@canonical.com--2004/canonical--devel--0--patch-14
   rename RosettaTranslationOrigin.CVS to VCS

 * daf@canonical.com--2004/canonical--devel--0--patch-15
   rename RosettaTranslationOrigin.VCS to SCM

 * david.allouche@canonical.com--2004/canonical--devel--0--base-0
   tag of rocketfuel@canonical.com/canonical--devel--0--patch-2

 * david.allouche@canonical.com--2004/canonical--devel--0--patch-1
   add "*.pyc" to the precious pattern

 * mark.shuttleworth@canonical.com/canonical--devel--0--base-0
   tag of rocketfuel@canonical.com/canonical--devel--0--patch-31

 * mark.shuttleworth@canonical.com/canonical--devel--0--patch-1
   add rosetta translation origin schema

 * mark.shuttleworth@canonical.com/canonical--devel--0--patch-2
   merge from rocketfuel

 * rocketfuel@canonical.com/canonical--devel--0--base-0
   initial import

 * rocketfuel@canonical.com/canonical--devel--0--patch-1
   Make canonical a top level package, add Makefile with dummy check target.

 * rocketfuel@canonical.com/canonical--devel--0--patch-2
   Make soyuz a working web application, add a very minimal rosetta with replaceable stubs.

 * rocketfuel@canonical.com/canonical--devel--0--patch-3
   add *.pyc to the precious pattern

 * rocketfuel@canonical.com/canonical--devel--0--patch-4
   Make post-mortem debugging work

 * rocketfuel@canonical.com/canonical--devel--0--patch-5
   Made browser error pages work properly

 * rocketfuel@canonical.com/canonical--devel--0--patch-6
   s/Soyuz/Launchpad/ in the root page

 * rocketfuel@canonical.com/canonical--devel--0--patch-7
   Added browser:traverse directive.

 * rocketfuel@canonical.com/canonical--devel--0--patch-8
   Enabled the Debug skin.

 * rocketfuel@canonical.com/canonical--devel--0--patch-9
   Improved 'traverse' zcml directive.

 * rocketfuel@canonical.com/canonical--devel--0--patch-10
   Improved debug skin.

 * rocketfuel@canonical.com/canonical--devel--0--patch-11
   Added lp.dbschema stuff.

 * rocketfuel@canonical.com/canonical--devel--0--patch-12
   added more schemas, made db schemas easier to read.

 * rocketfuel@canonical.com/canonical--devel--0--patch-13
   more dbschemas.  configure.zcml for lp.

 * rocketfuel@canonical.com/canonical--devel--0--patch-14
   enable lp: TALES api for requests

 * rocketfuel@canonical.com/canonical--devel--0--patch-15
   Improved docstring and __all__ of dbschema.py.  Finished all schema.

 * rocketfuel@canonical.com/canonical--devel--0--patch-16
   Moved all common resources/templates to lp/, fixed template errors.

 * rocketfuel@canonical.com/canonical--devel--0--patch-17
   Tracebacks on debug skin IUnauthorized and add code to optionally switch on ++apidoc++

 * rocketfuel@canonical.com/canonical--devel--0--patch-18
   Made apidoc not require permissions

 * rocketfuel@canonical.com/canonical--devel--0--patch-19
   Added launchpad templates.

 * rocketfuel@canonical.com/canonical--devel--0--patch-20
   changes to root index

 * rocketfuel@canonical.com/canonical--devel--0--patch-21
   removed lp-index, as it's not supposed to reside here

 * rocketfuel@canonical.com/canonical--devel--0--patch-22
   DBSchema -> IVocabulary

 * rocketfuel@canonical.com/canonical--devel--0--patch-23
   dbname setting

 * rocketfuel@canonical.com/canonical--devel--0--patch-24
   Enabled lp:ManifestEntryType --> 'A Tar File' thing, for all dbschema types.

 * rocketfuel@canonical.com/canonical--devel--0--patch-25
   added MAINTAINER note to dbschema.py

 * rocketfuel@canonical.com/canonical--devel--0--patch-26
   Custom widget example that didnt sync before

 * rocketfuel@canonical.com/canonical--devel--0--patch-27
   Added global navigation

 * rocketfuel@canonical.com/canonical--devel--0--patch-28
   Facist database encoding check

 * rocketfuel@canonical.com/canonical--devel--0--patch-29
   Added switching Malone logo.

 * rocketfuel@canonical.com/canonical--devel--0--patch-30
   Added Mailman stuff

 * rocketfuel@canonical.com/canonical--devel--0--patch-31
   dbschema update from andrewv

 * rocketfuel@canonical.com/canonical--devel--0--patch-32
   rosetta translation origin schema

 * rocketfuel@canonical.com/canonical--devel--0--patch-33
   renaming in dbschema.py

 * scott@canonical.com--2004/canonical-lp--devel--0--base-0
   tag of rocketfuel@canonical.com/canonical--devel--0--patch-22

 * scott@canonical.com--2004/canonical-lp--devel--0--patch-1
   add dbname variable

 * steve.alexander@canonical.com/canonical--devel--0--base-0
   tag of rocketfuel@canonical.com/canonical--devel--0--base-0

 * steve.alexander@canonical.com/canonical--devel--0--patch-1
   Added __init__.py to make canonical directory a python package.

 * steve.alexander@canonical.com/canonical--devel--0--patch-2
   Added dummy Makefile with check target to canonical package.

 * steve.alexander@canonical.com/canonical--devel--0--patch-3
   Added non-zodb oriented publication component, a noddy root page template, and a 'suburls' zcml directive.

 * steve.alexander@canonical.com/canonical--devel--0--patch-4
   merged changes from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-5
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-6
   Made the post-mortem debugging server work.  See soyuz/soyuz.conf.

 * steve.alexander@canonical.com/canonical--devel--0--patch-7
   made error pages work properly

 * steve.alexander@canonical.com/canonical--devel--0--patch-8
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-9
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-10
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-11
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-12
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-13
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-14
   Added a browser:traverse directive, to make it easy to specify traversing an app component by calling a method with a name.

 * steve.alexander@canonical.com/canonical--devel--0--patch-15
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-16
   enabled the Debug skin.  To use, add ++skin++Debug at the start of a URL.

 * steve.alexander@canonical.com/canonical--devel--0--patch-17
   Added 'function' attribute to traverse zcml directive.

 * steve.alexander@canonical.com/canonical--devel--0--patch-18
   Improved the tracebacks in the debug skin.  Specifically, you can now see what page template caused the error.

 * steve.alexander@canonical.com/canonical--devel--0--patch-19
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-20
   added canonical.lp.dbschema

 * steve.alexander@canonical.com/canonical--devel--0--patch-21
   added small example in module docstring

 * steve.alexander@canonical.com/canonical--devel--0--patch-22
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-23
   made Items comparable to ints

 * steve.alexander@canonical.com/canonical--devel--0--patch-24
   made items more readable.  added a few items from the real schema.txt

 * steve.alexander@canonical.com/canonical--devel--0--patch-25
   added some more of the schemas from schemas.txt.  still lots to go.

 * steve.alexander@canonical.com/canonical--devel--0--patch-26
   latest dbschema work.  also, added a lp/configure.zcml for common features of malone, rosetta and soyuz.

 * steve.alexander@canonical.com/canonical--devel--0--patch-27
   added TALES API for requests in the lp: namespace

 * steve.alexander@canonical.com/canonical--devel--0--patch-28
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-29
   added more to dbschema

 * steve.alexander@canonical.com/canonical--devel--0--patch-30
   finished dbschema.py.  ow my wrists.

 * steve.alexander@canonical.com/canonical--devel--0--patch-31
   added an __all__ and improved the example

 * steve.alexander@canonical.com/canonical--devel--0--patch-32
   removed titles from schema classes, added placeholders for title and name to DBSchema base class.

 * steve.alexander@canonical.com/canonical--devel--0--patch-33
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-34
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-35
   made apidoc viewable with zope.View permission.

 * steve.alexander@canonical.com/canonical--devel--0--patch-36
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-37
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-38
   merge from rocketfuel

 * steve.alexander@canonical.com/canonical--devel--0--patch-39
   Added doctest unit test for request api.

 * steve.alexander@canonical.com/canonical--devel--0--patch-40
   Added hackish lookup-by-int to DBSchema / Item class.  It is hackish because I still haven't bothered to write it as a metaclass.  Also, implemented number/lp:DBSchemaClassName --> DBSchemaClassName.NUMBEREDITEM.title

 * steve.alexander@canonical.com/canonical--devel--0--patch-41
   Enabled the number/lp:ManifestEntryType --> 'A Tar File' tales thing.

 * steve.alexander@canonical.com/canonical--devel--0--patch-42
   Disable check target of Makefile (temporarily).

 * steve.alexander@canonical.com/canonical--devel--0--patch-43
   Added MAINTAINER note

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

 * stuart.bishop@canonical.com/canonical--devel--0--patch-1
   Enable /++apidoc++ Zope3 live online documentation browser 

 * stuart.bishop@canonical.com/canonical--devel--0--patch-2
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-3
   Turn off specialized Unauthorized debug view -- default gives more info

 * stuart.bishop@canonical.com/canonical--devel--0--patch-4
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-5
   Method to generate IVocabulary from a DBSchema 

 * stuart.bishop@canonical.com/canonical--devel--0--patch-6
   Remove dropping 

 * stuart.bishop@canonical.com/canonical--devel--0--patch-7
   Merge from rocketfuel 

 * stuart.bishop@canonical.com/canonical--devel--0--patch-8
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-9
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-10
   Initial custom widget sample code

 * stuart.bishop@canonical.com/canonical--devel--0--patch-11
   Complex widget not using SimpleInputWidget

 * stuart.bishop@canonical.com/canonical--devel--0--patch-12
   Custom widget example

 * stuart.bishop@canonical.com/canonical--devel--0--patch-13
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-14
   whitespace

 * stuart.bishop@canonical.com/canonical--devel--0--patch-15
   Facist database encoding check

 * stuart.bishop@canonical.com/canonical--devel--0--patch-16
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-17
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-18
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-19
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-20
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-21
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-22
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-23
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-24
   Merge from rocketfuel

 * stuart.bishop@canonical.com/canonical--devel--0--patch-25
   dbschema update from andrewv - add BugSubscription

 * stuart.bishop@canonical.com/canonical--devel--0--patch-26
   sync main_template from rocketfuel