Merge branch 'stable' debian/20100704+stable-1
authorIan Beckwith <ianb@erislabs.net>
Sun, 4 Jul 2010 02:08:08 +0000 (03:08 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 4 Jul 2010 02:08:08 +0000 (03:08 +0100)
commit5e98206a1532f3cd110f123e5ad21e59d3eb0c1a
tree66fbcafd1c59628451bb9c66ca086217efaca38a
parentcba438acdae37afb7ad6d4e4f4e76c11e5156791
parent2ed5d94bb961be40b153f0882d1de21170859922
Merge branch 'stable'