upstream/20100821

Samuel Thibault

@sthibault

7ab87155 · Merge branch 'upstream' into upstream-merged · Aug 21, 2010

new snapshot to fix parted configuration rules