[kstart/el6: 6/6] Merge branch 'master' into el6

[Ken Dreyer]

commit d5b96ac2f608d400ca52098f2120443bc91be27d
Merge: a7f2684 6859b78
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Tue Jul 12 11:10:10 2011 -0600

    Merge branch 'master' into el6

 .gitignore  |    1 +
 kstart.spec |   13 ++++++++++---
 sources     |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---