Merge with Michael and resolve conflicts
authorbubulle@debian.org <>
Mon, 21 Aug 2006 15:55:15 +0000 (10:55 -0500)
committerbubulle@debian.org <>
Mon, 21 Aug 2006 15:55:15 +0000 (10:55 -0500)
commit3784e34677882fbea8538baa1c25b0d35abf429a
tree2c4d4f7c81d6126fdce3b1c4665c7f80efb0fb74
parent8fa7672020f75a9ec7d3ffcfd8c8f3aad6f159b7
parent02b7ddb1404fa3969bceb03a5f35107884027ba6
Merge with Michael and resolve conflicts