Rev 1931: (jelmer): fix setup.py in /home/pqm/archives/thelove/bzr/+trunk/

Wed Aug 16 16:05:03 BST 2006

------------------------------------------------------------
revno: 1931
revision-id: pqm at pqm.ubuntu.com-20060816150502-20bf29428b64b29a
parent: pqm at pqm.ubuntu.com-20060816143120-21f567e8e50d2414
parent: john at arbash-meinel.com-20060816145607-1d04b3a38ec1e118
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-08-16 16:05:02 +0100
message:
  (jelmer): fix setup.py
modified:
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060816145607-1d04b3a38ec1e118
    parent: john at arbash-meinel.com-20060816145538-008622c22ff48b2b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-08-16 09:56:07 -0500
    message:
      (jelmer): fix setup.py
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060816145538-008622c22ff48b2b
    parent: john at arbash-meinel.com-20060815130611-e68a78b9b368ed4c
    parent: pqm at pqm.ubuntu.com-20060816143120-21f567e8e50d2414
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-08-16 09:55:38 -0500
    message:
      [merge] bzr.dev 1930