BZR merge-modified list format 1
file_id: changelog-20110810214018-i0kajfmuffo22uyx-2
hash: e4445649ca977a8d7c624eaab82a036769240b88
