Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Mon, 11 Jan 2010 18:16:43 +0000 (19:16 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 11 Jan 2010 18:16:43 +0000 (19:16 +0100)
commitcf923ff8eb417d98a72f2b2c457b0a667d1d0dff
tree4247055377911101622896bd3b7369cd8551bbbf
parenta89f860830ed265aa3fbd2048154f645a7b458ef
parentc14a52a60ae878ab1704da3398a67520c59d466f
Merge branch 'master' into gregoa