Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 20:36:56 +0000 (14:36 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 20:36:56 +0000 (14:36 -0600)
commit1cbc63c39aad83f1a7963b1a2e5b14e982cea180
tree04d7a1ea0c4169547204018215b80ef09c5ba5cc
parent62acedaadaa4b1cc4acccc54a592fe425b96e177
parent9fb70f2dfbea87fd0a624a5addf03fcbafc9b48a
Merge branch 'dfsg-orig' into dfsg-debian