Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:37:35 +0000 (21:37 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:37:35 +0000 (21:37 +0100)
commit96daadba977c4c0036c23a25e7f903659165e8e1
treea1f0413cc83e0107861c30379f7089b610a99dfb
parentdb2da6c8af0cd2776d3079a1ab8500439761b031
parentbe46209d9713adf0df2780876a7fdd6dd9c6e82a
Merge branch 'upstream'