[vifir/f11/master: 18/18] Merge branch 'master' into f11

[Dave Ludlow]

commit b2cf90d4b289b4fd2c3b6bea9c9a4e5617bd716f
Merge: 33a094f 7acec05
Author: David Ludlow <dave at adsllc.com>
Date:   Mon Mar 14 08:49:10 2011 -0400

    Merge branch 'master' into f11
    
    Conflicts:
    	.gitignore
    	sources
    	vifir.spec

 .gitignore |    2 +-
 sources    |    2 +-
 vifir.spec |   97 ++++++++++++++++++++++++++++++++++++++++--------------------
 3 files changed, 67 insertions(+), 34 deletions(-)
---