-
Committer:
Launchpad Patch Queue Manager
-
Date:
2010-04-28 06:21:36 UTC
-
mfrom:
(9308.1.1 db-devel)
-
Revision ID:
launchpad@pqm.canonical.com-20100428062136-numbeu2aef3o1z51
[rs=mwhudson][ui=none] merge stable, fixing conflicts, revs 10791,
10792, 10793 included