Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 3 Apr 2010 20:42:50 +0000 (22:42 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 3 Apr 2010 20:42:50 +0000 (22:42 +0200)
commit43677c8ab39c540121af5fdfaecf14ff2275556c
treeb4edb2d5e8bdd61fa68df802e0584b11b614d483
parentec503392ddba6000fac8ac18dea94a0e2ba860c1
parent9f499aea8afa7bab339ccd1d47fc327c8b5ba162
Merge branch 'master' into gregoa