Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:47:03 +0000 (21:47 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:47:03 +0000 (21:47 +0100)
commit0dd424dc60b029b6ea0d9cde6a271e842418b2be
treeee5e754e8bb7947e24785c72f4a24a1c4fa4e3ff
parent1f230f5afb496fe9c75d63ebcebd570ad1ab99ee
parentf690d39fe83c980caeed5f33bf4e6389e8cb489f
Merge branch 'upstream'