Merge branch 'upstream'
authorCharles Plessy <plessy@debian.org>
Mon, 14 Sep 2009 13:27:26 +0000 (22:27 +0900)
committerCharles Plessy <plessy@debian.org>
Mon, 14 Sep 2009 13:27:26 +0000 (22:27 +0900)
commitd363084f0412f3bcdeb0304aeb0974c9a10c7649
treeeb0a0dae8b68c55bba6c94d411e4d9c513f0770e
parent4836a5b9b0b370a259514b52a9321dc1dd19e08d
parent4a17fa7e1f91b2fe04ad334a63fc2b0d5e859d8a
Merge branch 'upstream'