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

[Silas Sewell]

commit b4f05e2fb02e1b8100ffa9792055e4ac7bde96b9
Merge: a34b7f2 771387f
Author: Silas Sewell <silas at sewell.org>
Date:   Sat May 19 08:43:33 2012 -0400

    Merge branch 'f17'

 fabric.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---