Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sun, 16 Nov 2008 08:22:18 +0000 (03:22 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sun, 16 Nov 2008 08:22:18 +0000 (03:22 -0500)
commit5d9949335aeb1dec04f530cbb3dfcac24288706a
treee4c81a45e2dcfdd46409beab222d122751f5f6d7
parentdd002c89fc4dccabc16d488a15a40cc88383605f
parentd056cc64effacd7936fddb6e696957868fff7eed
Merge commit 'dkg/master'

Conflicts:

packaging/debian/changelog
packaging/debian/changelog