Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:47:02 +0000 (21:47 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:47:02 +0000 (21:47 +0100)
commit6e4046743354e087d7e06e88c357f28ed0006bd1
treeb6e6933fee85bef081b9eb56e116d10af791a6c6
parent6de19d2d012cb84b65bf150927cd86e4d27a2627
parent27ce29e322d29ab92cd6105538d2de4689d3af33
Merge branch 'upstream'