Merge commit 'upstream/0.6'
authorDominique Belhachemi <domibel@debian.org>
Fri, 16 Dec 2011 21:17:04 +0000 (16:17 -0500)
committerDominique Belhachemi <domibel@debian.org>
Fri, 16 Dec 2011 21:17:04 +0000 (16:17 -0500)
commita809dcb3d26ff8036fcc98f56ba5908c17e4987d
treee687aee1ba28fbace941b828e1d85d10e7f5504a
parentdfadee1e6752a6ae0caf46704948d8c3d60e2d5c
parent00bf9252baa11c7ae6791da4d29412b6babdb785
Merge commit 'upstream/0.6'