[vifir/f15: 3/3] Merge branch 'master' into f15

[Dave Ludlow]

commit 6e066d9ce401ef08d05b578e60b1863718ec6dfc
Merge: fbaf929 de00494
Author: Dave Ludlow <davel at adsllc.com>
Date:   Mon Aug 1 12:30:18 2011 -0400

    Merge branch 'master' into f15

 .gitignore |    2 +-
 sources    |    2 +-
 vifir.spec |    8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)
---