Merge commit 'ms/parted'
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 19 Jan 2011 18:24:45 +0000 (19:24 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 19 Jan 2011 18:24:45 +0000 (19:24 +0100)

Trivial merge