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

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 471
revision-id: jelmer at samba.org-20080425202721-3tyieulz174qbyth
parent: jelmer at samba.org-20080425202328-3cpit50s53ow5410
parent: argentina at gmail.com-20080425201440-n21he69wzw3niy9y
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-04-25 21:27:21 +0100
message:
  Merge trunk.
    ------------------------------------------------------------
    revno: 465.1.1
    revision-id: argentina at gmail.com-20080425201440-n21he69wzw3niy9y
    parent: jelmer at samba.org-20080425193731-s4sdmfj56xp1394s
    parent: javierder at gmail.com-20080414234847-0lk89ee7aohyf94m
    committer: Martin Albisetti <argentina at gmail.com>
    branch nick: gtk.patch
    timestamp: Fri 2008-04-25 17:14:40 -0300
    message:
      Merge patch
    modified:
      branchview/linegraph.py        graph.py-20051016214152-ebf565808c860cf7
      revbrowser.py                  revbrowser.py-20070201094155-v2139s0zp4mmolvq-1
      viz/branchwin.py               branchwin.py-20051016222514-15fd120652fcf25c