Merged 5.2 in.
authorNatalia B. Bidart <natalia.bidart@canonical.com>
Tue, 22 May 2012 12:34:16 +0000 (09:34 -0300)
committerNatalia B. Bidart <natalia.bidart@canonical.com>
Tue, 22 May 2012 12:34:16 +0000 (09:34 -0300)
commit17cb2b9d03041186b10b44198e19a0be9c20ad01
treec1bd8159b3370053d019e5fab5225a78ad232dac
parent44e98c5224b4c02389f154a9d9ee90b1fb09b3e4
parentd28818aa218796f53bebd827e65642b4260241f3
Merged 5.2 in.