This change has been merged. Previous status: Conditionally approved For details, see: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C1234103572.5035.12.camel%40sophie.daniel-watkins.co.uk%3E Project: Bazaar