[qtparted/f13/master: 5/5] Merge branch 'master' into f13

[Steven Pritchard]

commit fb9b11edcc31e0dd2c8fdceffd92a25677d44ac6
Merge: ffcc746 1453d45
Author: Steven Pritchard <steven.pritchard at gmail.com>
Date:   Wed Oct 27 12:27:18 2010 -0500

    Merge branch 'master' into f13

 qtparted-0.4.5-parted-version.patch |   36 +++++++++++++++++++++++++++++++++++
 qtparted.spec                       |   15 ++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)
---