Branches for Lenny

Author: Aaron M. Ucko
Revision Date: 2008-07-24 19:59:08 UTC

* Clean up /usr/share/bitpim/resources; in particular, use usbutils's
  usb.ids rather than a stale copy. (LP: #77929.)
* Update path to evolution's contacts. (LP: #221006.)
* src/database.py (Database._getindirect): strip spurious trailing L
  characters that have started showing up in row numbers.
* src/bp.py: explicitly use wxPython 2.6, as other versions aren't 100%
  compatible. (LP: #177569.)