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

[terjeros]

commit 50a817ac5a89d5091287d0bc9b822c5a2282d3fc
Merge: 5d9277e fd25a52
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sat Jan 29 20:00:01 2011 +0100

    Merge branch 'master' into f13

 .gitignore |    1 +
 gdisk.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---