[gappa/f14: 2/2] Merge branch 'master' into f14

[Jerry James]

commit 1ed091af432f3ac24605cf7aaf5da9bcb27b49e8
Merge: f20c90b 863b04d
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Sep 19 14:10:20 2011 -0600

    Merge branch 'master' into f14

 .gitignore |    2 +-
 gappa.spec |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---