-
Committer:
Sidnei da Silva
-
Date:
2009-10-21 21:43:07 UTC
-
mfrom:
(120.2.15 yui-3.0.0)
-
mto:
(124.5.1 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
126.
-
Revision ID:
sidnei.da.silva@canonical.com-20091021214307-mpul9404n317puk5
- Merge from yui-3.0.0, resolving conflicts