[g2clib/el5: 3/3] Merge branch 'master' into el5

[Orion Poplawski]

commit be7248ea5097b461b0757ae0c685c3de65402365
Merge: fa7d369 ba6a103
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 10 08:55:30 2011 -0600

    Merge branch 'master' into el5

 .gitignore  |    1 +
 g2clib.spec |   12 +++++++++---
 sources     |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---