[gnome-disk-utility: 5/5] Merge branch 'f15'

[Tomas Bzatek]

commit fa77706511c0ea59d72a40a2e1b826757ad4570a
Merge: 0ab8dbf c47bea1
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Apr 22 14:00:42 2011 +0200

    Merge branch 'f15'
    
    Conflicts:
    	gnome-disk-utility.spec

 .gitignore              |    2 ++
 gnome-disk-utility.spec |   18 +++++++++++++-----
 sources                 |    2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)
---