Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:37:34 +0000 (21:37 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:37:34 +0000 (21:37 +0100)
commiteefeca653ec965647bcc8eb801d0bbc9ef6dd3e6
tree02b2a0fbc99f3ffd00ac52988da01ff0ae292f9a
parent3ead8eb04bd0a88e01032e7842f242dc39048303
parentc130c08f47594e91d5a9295d50b0d3e583cd2543
Merge branch 'upstream'