Rev 544: Merge fix for import in Olive rename dialog. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 544
revision-id: jelmer at samba.org-20080718103925-mdry4utmaaxvr1l9
parent: jelmer at samba.org-20080718103813-unyn4c5749jcympr
parent: klight at x111-20080714184805-85fmycpqx1stizxz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-07-18 12:39:25 +0200
message:
  Merge fix for import in Olive rename dialog.
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
    ------------------------------------------------------------
    revno: 531.3.1
    revision-id: klight at x111-20080714184805-85fmycpqx1stizxz
    parent: jelmer at samba.org-20080701215625-udvespwg6srjo252
    committer: klight <klight at X111>
    branch nick: fixrename
    timestamp: Mon 2008-07-14 14:48:05 -0400
    message:
      This patch fixes a traceback when the olive rename dialog is to be displayed.
      The wrong import location was called for show_bzr_error.
    modified:
      olive/rename.py                rename.py-20060809143844-edgdedgalykd5zci-1
=== modified file 'NEWS'
--- a/NEWS	2008-07-18 10:38:13 +0000
+++ b/NEWS	2008-07-18 10:39:25 +0000
@@ -36,6 +36,8 @@
 
   * Fix broken symlink handling. (Jasper Groenewegen)
 
+  * Fix import in Olive rename dialog. (Kevin Light)
+
  CHANGES
 
   * Moved notify icon code to separate script. (Jelmer Vernooij)