Merge branch 'upstream'
authorGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 21:36:47 +0000 (22:36 +0100)
committerGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 21:36:47 +0000 (22:36 +0100)
commit0fd440c1a068830e27d1ee40580be59aa5977e02
treec034068c205892f6ce8343daa5708ed19f1313d2
parentcfd67db38254787e9e2e68950a4c9ae066b80826
parentb9466f3619daa22367e64aaebb271c79905a23c5
Merge branch 'upstream'