[Pkg-bazaar-commits] ./bzr-gtk/unstable r113: Merge from trunk.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 113
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Thu 2006-12-07 17:28:10 +0100
message:
  Merge from trunk.
    ------------------------------------------------------------
    revno: 66.2.7
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2006-12-01 22:14:30 +0100
    message:
      Merge some bugfixes from Szilvester.
    modified:
      olive/__init__.py
      olive/menu.py