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

[Jon Ciesla]

commit 3fa9d57d413df3f5e11d1b4f21c4268abea461b2
Merge: 3583dad da59abb
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Jan 23 13:03:20 2013 -0600

    Merge branch 'el6' into el5

 ucarp.init |   18 ++++++++++++++++--
 ucarp.spec |    8 +++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)
---