Merge proposals dependent on lp:~johnsca/charms/precise/couchbase/fix-install

lp:~johnsca/charms/precise/couchbase/fix-install has no merge proposals.