[rabbitvcs/f16: 7/7] Merge branch 'f17' into f16

[Jon Ciesla]

commit 9e8b538a97f23c0913681851cedb14d6982b41f8
Merge: 5f1171b 188d310
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue May 1 20:23:35 2012 -0500

    Merge branch 'f17' into f16
    
    Conflicts:
    	rabbitvcs.spec
    	sources

 .gitignore     |    1 +
 rabbitvcs.spec |   44 +++++++++++++++++++++++---------------------
 sources        |    2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)
---