BZR merge-modified list format 1
file_id: notebook.vala-20110924175625-2skp41a7yo8rw6gw-10
hash: 48beaaa990a10c4b814bba8ef17a0518d7a3765c
