Merge branch 'bdale'
authorBdale Garbee <bdale@gag.com>
Fri, 27 Aug 2010 18:38:25 +0000 (12:38 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 27 Aug 2010 18:38:25 +0000 (12:38 -0600)
commitcf65c6b8056c4af7c26b52ec6f9fbd3400cef638
tree27ac7441d1963e93a153daa7c4573a4ba474e257
parent5f2f6a8f9ba56be867888758848bc7f152ccbd47
parentae5eff7bc0b63047737223423009707bedcb00f5
Merge branch 'bdale'

Conflicts:
debian/control