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

[Paul W. Frields]

commit 74af07dbac2cd78d201d3a1adadd080b447a848a
Merge: 3a8d079 4b6e873
Author: Paul W. Frields <stickster at gmail.com>
Date:   Sat Mar 26 14:11:51 2011 -0400

    Merge branch 'master' into f14

 pulsecaster.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---