[vifir/f14/master: 8/8] Merge branch 'master' into f14

[Dave Ludlow]

commit a96e1ec81c45216a58df064177041feeeee5a703
Merge: f7d512c 7acec05
Author: David Ludlow <dave at adsllc.com>
Date:   Mon Mar 14 08:44:01 2011 -0400

    Merge branch 'master' into f14
    
    Conflicts:
    	vifir.spec

 .gitignore |    2 +-
 sources    |    2 +-
 vifir.spec |   95 ++++++++++++++++++++++++++++++++++++++---------------------
 3 files changed, 63 insertions(+), 36 deletions(-)
---