commit cbc7c20fad0922c6672736218192c07b616a52f9 Merge: f1e6e0a ed18cda Author: Ken Dreyer <ktdreyer at ktdreyer.com> Date: Wed Nov 23 17:30:14 2011 -0700 Merge branch 'el4' Conflicts: remctl.spec ---