[fabric: 9/9] Merge branch 'f17'

[Silas Sewell]

commit a34b7f29e6cbe3cccd6f55e3df0fcafb15327a66
Merge: 3dff9bc 78ae912
Author: Silas Sewell <silas at sewell.org>
Date:   Sat May 19 08:17:01 2012 -0400

    Merge branch 'f17'
    
    Conflicts:
    	fabric.spec

 fabric.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---