commit 6ac16c682e6c19ee655b3ddd5c86c13503506dc7 Merge: d7c0c5d 1b40396 Author: Orion Poplawski <orion at cora.nwra.com> Date: Mon Apr 23 09:48:44 2012 -0600 Merge branch 'el6' into el5 .gitignore | 1 + gdisk.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---