BZR merge-modified list format 1
file_id: model1.py-20091011151609-0xbh2g1pqbz4vrte-2
hash: 6320d827cd63e1b2553c753c1e784ca0d6ea862b

file_id: setup.py-20091011151344-97bazu6c5s1rhkcj-1
hash: 9ba47e59d0373a768c2324ade93b8cdfc23dd84f
