Sync charm-helpers from lp:charm-helpers
[gnuoy, r=tribaal] Sync charm-helpers from lp:charm-helpers