Merged 5.2 in.
authorNatalia B. Bidart <natalia.bidart@canonical.com>
Mon, 21 May 2012 15:34:10 +0000 (12:34 -0300)
committerNatalia B. Bidart <natalia.bidart@canonical.com>
Mon, 21 May 2012 15:34:10 +0000 (12:34 -0300)
commited34d91d199ec4f28714e9486a8de476b01a488e
tree2305a83865849dbc01643a9d8ab00060ad1c79fa
parent0900be429d0fb5ece7e509acb83eec6b691d792b
parentc21770151ba876df18d8b25b545e729a32c88085
Merged 5.2 in.