[Merge] lp:~clint-fewbar/ubuntu/maverick/libdbi/upstream-0.8.4 into lp:ubuntu/libdbi

[Clint Byrum]

The conflicts listed are in large part because I pulled in the code from sid's 0.8.3-1 rather than 0.8.3-0ubuntu1.

This should really treated like a sync from debian's 0.8.3-1, then merging these changes. Unfortunately, I'm not sure how to tell bzr how to do that.
-- 
https://code.launchpad.net/~clint-fewbar/ubuntu/maverick/libdbi/upstream-0.8.4/+merge/34365
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~clint-fewbar/ubuntu/maverick/libdbi/upstream-0.8.4 into lp:ubuntu/libdbi.