Merge proposals dependent on lp://staging/~jorge/charms/precise/couchdb/add-readme

lp://staging/~jorge/charms/precise/couchdb/add-readme has no merge proposals.