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

[Orion Poplawski]

commit f55843a5326fa5422454c9aaf46ed493ba22c66d
Merge: e8383ea ba6a103
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 10 08:24:24 2011 -0600

    Merge branch 'master' into f14

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