Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Wed, 12 Jan 2011 23:11:47 +0000 (00:11 +0100)
committergregor herrmann <gregoa@debian.org>
Wed, 12 Jan 2011 23:11:47 +0000 (00:11 +0100)
commit265cb514ec1ec84872929a9182c9091b73009272
treee7656f73682ce8fc9bdc5671fad8e7e6933b64f5
parenta2a9b063ba94efbaa4a70e2d9a0e2ffd4d3c5531
parent2557d9168ac942c9cdcf7c0c5d5f76d628c80939
Merge branch 'master' into gregoa