[gdisk/f13/master: 3/3] Merge branch 'master' into f13

[terjeros]

commit 0ae6243f8f2573c87155ad9975c2199876601383
Merge: 50a817a e338174
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Mon Apr 11 11:19:46 2011 +0200

    Merge branch 'master' into f13

 .gitignore               |    1 +
 gdisk.spec               |   18 ++++++++++++++----
 gptfdisk-0.7.1-dso.patch |   15 +++++++++++++++
 sources                  |    2 +-
 4 files changed, 31 insertions(+), 5 deletions(-)
---