Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:37:36 +0000 (21:37 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:37:36 +0000 (21:37 +0100)
commit9c06b9a2eaae335d9c870b1bdb533d1eef51e035
treef6dba829078b6f63666ed8c02db321a44ef394c6
parente3e90037827f3739ac18ccc545d83ede22af61ad
parent295ecf7578d0cadf8f8937e8e42171920bcd93ea
Merge branch 'upstream'