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

[Orion Poplawski]

commit 079ef1f3dd7e109c4e7d1a7e7c24d831c13569e8
Merge: e69183b ba6a103
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 10 09:04:37 2011 -0600

    Merge branch 'master' into el4

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