BZR merge-modified list format 1
file_id: changelog-20120503143120-95lt6pgfjb2a8wgz-22
hash: ec0c508290cd9d92f6aea1f9fd09bc5eb9a38510

file_id: control-20120503143120-95lt6pgfjb2a8wgz-24
hash: 8546fdabae11d59c36a92b54937b8b60eac66b21
