[ucarp/el5: 2/2] Merge branch 'el6' into el5

[Jon Ciesla]

commit c5b75e775dbfb5f7a907612d30f12c535b434473
Merge: 7c86a53 20ecf82
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Nov 12 14:45:32 2012 -0600

    Merge branch 'el6' into el5

 ucarp.init |   31 ++++++++++++++++++++++---------
 ucarp.spec |    9 ++++++++-
 2 files changed, 30 insertions(+), 10 deletions(-)
---