Merged 5.2 in.
authorNatalia B. Bidart <natalia.bidart@canonical.com>
Mon, 21 May 2012 15:34:58 +0000 (12:34 -0300)
committerNatalia B. Bidart <natalia.bidart@canonical.com>
Mon, 21 May 2012 15:34:58 +0000 (12:34 -0300)
commit8d8382c76254837763b66a40c6e169875860cf78
tree24b696062afd4536b41f6bc67a829bc055680efc
parentf5d85dd8bee24b42ab920d16114bc7fea7988203
parentc21770151ba876df18d8b25b545e729a32c88085
Merged 5.2 in.