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

[Paul W. Frields]

commit 0a549d2ff744bbd80b4a47e7b2e6340263867880
Merge: e5c3586 3f7ca64
Author: Paul W. Frields <stickster at gmail.com>
Date:   Wed Mar 16 21:15:02 2011 -0400

    Merge branch 'master' into f14

 .gitignore       |    1 +
 pulsecaster.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---