Rev 628: merge trunk. in file:///home/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 628 [merge]
revision-id: jelmer at samba.org-20090421220010-9ix3gjr3g68kwwlv
parent: jelmer at samba.org-20090410013507-ua401fzhnytf1a4c
parent: colbrac at xs4all.nl-20090307204625-d7knt16hebc4s5tc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2009-04-22 00:00:10 +0200
message:
  merge trunk.
added:
  commands.py                    commands.py-20090130155922-t4lwr3zlh9vausk0-1
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
  __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
  bzr-notify                     bzrnotify-20080627170430-4b539wovvj4cgljp-1
------------------------------------------------------------
Use --levels 0 (or -n0) to see merged revisions.

Diff too large for email (1154 lines, the limit is 1000).