[remctl/el5: 22/23] Merge branch 'el5'

[Ken Dreyer]

commit f1e6e0a9ae4367b69178cb46671d87d949684fd4
Merge: bf95d2e e2b879d
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Wed Nov 23 17:27:27 2011 -0700

    Merge branch 'el5'
    
    Conflicts:
    	remctl.spec

---