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

[Orion Poplawski]

commit ad7cc779015677f843291998868653471c3528dc
Merge: 638855b d641aca
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Mar 12 21:15:25 2014 -0600

    Merge branch 'master' into el6

 gdisk.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---