[mate-utils/f18: 2/2] Merge branch 'master' into f18

[leigh123linux]

commit 9aca0aafe782a1a5747400a5b1dac16c5c6f79b9
Merge: 22f0212 4f61e88
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Nov 8 20:37:38 2012 +0000

    Merge branch 'master' into f18

 mate-utils.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc mate-utils.spec
index 01bbd87,51c4f3a..89d19a9
--- a/mate-utils.spec
+++ b/mate-utils.spec
@@@ -230,7 -230,11 +230,10 @@@ f
  
  
  %changelog
+ * Thu Nov 08 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-4
+ - rebuild for 1.5.0
+ 
  * Mon Nov 05 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-3
 -- drop gdict-applet till upstream fixes it
  - sort out lang file mess
  - link identical immages in help to save space
  - fix directory ownership of help files