[MERGE] When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'.

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C1241493329.20116.133.camel%40lifeless-64%3E
Project: Bazaar