Rev 511: Merge trunk. in file:///data/jelmer/bzr-gtk/trayicon/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trayicon/

------------------------------------------------------------
revno: 511
revision-id: jelmer at samba.org-20080628153345-d1cvdjtkvui04ge3
parent: jelmer at samba.org-20080627173210-7fv8ctyb8t3fperk
parent: szilveszter.farkas at gmail.com-20080628074310-31znzgsw5o99r3x0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trayicon
timestamp: Sat 2008-06-28 17:33:45 +0200
message:
  Merge trunk.
    ------------------------------------------------------------
    revno: 505.1.1
    revision-id: szilveszter.farkas at gmail.com-20080628074310-31znzgsw5o99r3x0
    parent: iacobs at m0n5t3r.info-20080624103438-4ujpbj1h49nrfxzb
    parent: jelmer at samba.org-20080627165509-7b68w2chzvvgc8vz
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: trunk
    timestamp: Sat 2008-06-28 09:43:10 +0200
    message:
      Merge bzr-handle-patch fix from Jelmer.
    renamed:
      handle-patch => bzr-handle-patch handlepatch-20080223063850-kv7c3nsqsserhwr7-1
    modified:
      __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
      bzr-gtk.applications           bzrgtk.applications-20080402175949-05iv16su7ixv3hq8-1
      setup.py                       setup.py-20060716162505-h2isrtlg8lmlg2o2-1
      bzr-handle-patch               handlepatch-20080223063850-kv7c3nsqsserhwr7-1