Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 02:22:06 +0000 (03:22 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 02:22:06 +0000 (03:22 +0100)
commit753ba864e402ad6c261d122400c4a0dc2f8ab237
tree721c1e80b38713ed7780f2b62b540925f4bdcfdc
parentd3cfff9354cfd140b65c9b1197e6deca33615326
parentb58c46170a650521947aeaff5283a7a758ec75a1
Merge branch 'master' into gregoa