Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:41:50 +0000 (21:41 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:41:50 +0000 (21:41 +0100)
commite6b9b3cbbb469ad1eaf5ea7a5c47812594312877
tree865bef1d0279bec995c0b32d7d4d6ac23c9745e1
parent1f6dd82028f8db6117e0f16cbb8e81b919fb7dc2
parent5f6d853137e123be602d4565b49990df473178db
Merge branch 'upstream'