[linsmith/f19: 4/4] Merge branch 'master' into f19

[Jon Ciesla]

commit 5b536ceb577567b71e66fef80cef8e96a2d88b35
Merge: 15670d9 ac4ce64
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Apr 26 09:20:53 2013 -0500

    Merge branch 'master' into f19
    
    Conflicts:
    	linsmith.spec

 linsmith.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---