-
Committer:
Haw Loeung (hloeung)
-
Date:
2012-07-24 12:53:36 UTC
-
mfrom:
(6541 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6542.
-
Revision ID:
haw.loeung@canonical.com-20120724125336-r3wzxm02lyec7jm6
[hloeung] Merged with upstream resolving conflicts.