mergeback from 5.2 branch
authorGary Lasker <gary.lasker@canonical.com>
Mon, 21 May 2012 21:15:26 +0000 (17:15 -0400)
committerGary Lasker <gary.lasker@canonical.com>
Mon, 21 May 2012 21:15:26 +0000 (17:15 -0400)
commit54e054a0d3f767f39ecf164de3727541df3bac81
treed72a693cb3ce47261a091d4c26d08898c5a693dc
parent531d3e03e465917663a66241fd98225953b69a3e
parent7d3f854777ab750f7b27cdd26dbcb2081c9b4535
mergeback from 5.2 branch