Merge branch 'upstream' into dfsg-orig
authorBdale Garbee <bdale@gag.com>
Wed, 1 Jul 2009 18:46:39 +0000 (15:46 -0300)
committerBdale Garbee <bdale@gag.com>
Wed, 1 Jul 2009 18:46:39 +0000 (15:46 -0300)
commitd5a7e356d395fe65871629bb9f7ddc17e1bebada
treeaf90dfbecbe6f615eed565a7e2aedfd9498e2ae2
parent9fb70f2dfbea87fd0a624a5addf03fcbafc9b48a
parent00fa13ff3f2d5b6e2a94c5e948c38616ff7ad37a
Merge branch 'upstream' into dfsg-orig