Merge proposals dependent on lp:~clint-fewbar/charms/oneiric/omgubuntu-wp/trunk

lp:~clint-fewbar/charms/oneiric/omgubuntu-wp/trunk has no merge proposals.