-
Committer:
Martin Albisetti
-
Date:
2008-10-25 19:26:49 UTC
-
mfrom:
(232 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
233.
-
Revision ID:
martin.albisetti@canonical.com-20081025192649-7r5g6vyyqh2p748t
Merge from trunk, resolved conflicts