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)
commitb7e680f2eb66cfdef715c07a442d8982eefd5550
tree8a85b58dfe4896d0b646954d97d01fdf62a8084a
parent73c7eff80ece6765c5c147514a3ce2153f7bf4c8
parent5d547072c3e454549eb0ac0c36827ebcba8eba4a
Merge commit 'ms/parted'