merge from the 5.2 branch
authorGary Lasker <gary.lasker@canonical.com>
Mon, 21 May 2012 20:55:38 +0000 (16:55 -0400)
committerGary Lasker <gary.lasker@canonical.com>
Mon, 21 May 2012 20:55:38 +0000 (16:55 -0400)
commit72e0516db880f11a883623735d3b3c444e7bef5d
treefd1619da728e7e68495b692fe34ff7e5b040576a
parent29586069587ffbf2529100c76c0410ee4c7699d2
parent7d3f854777ab750f7b27cdd26dbcb2081c9b4535
merge from the 5.2 branch
debian/changelog