[gparted/f18: 7/7] Merge branch 'master' into f18

[Deji Akingunola]

commit b88d1817486209614aad940dded9fdafe90dfd82
Merge: 5f2fd9b ae2447f
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Mon Jun 10 20:45:24 2013 -0400

    Merge branch 'master' into f18
    
    Conflicts:
    	gparted.spec
    	sources
    
    Fix merge conflicts

 .gitignore   |    3 +++
 gparted.spec |   11 ++++++-----
 sources      |    4 ++++
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --cc sources
index e31bf5d,41c39b1..2b7cd9c
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +1ffe859c70e102a776dffb1ff0a2164a  gparted-0.14.1.tar.bz2
++=======
+ 3f399bff031b5ce14d11a8c346f4b89c  gparted-0.16.1.tar.bz2
++>>>>>>> master