Merge branch 'master' into squeeze
authorBdale Garbee <bdale@gag.com>
Sun, 17 Jun 2012 04:41:07 +0000 (22:41 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 17 Jun 2012 04:41:07 +0000 (22:41 -0600)
commit538ae376635af705ebcd686f3b4b7b72a6652985
treedd514fab514ac9488b39d67646793265a0c1e46d
parent11425c69eb58b6103beb68adc13912735ba36975
parentbbff4a953ad32c3021de3dba25e28372cb9b359d
Merge branch 'master' into squeeze

Conflicts:
debian/changelog
debian/control
debian/changelog