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

[Jon Ciesla]

commit 7c86a53910e66b72b9b5e318af4656dfc0978382
Merge: 922f7c1 278f2fe
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Oct 25 09:37:48 2012 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	ucarp.spec

 ucarp-1.3-pre.patch      | 1656 ----------------------------------------------
 ucarp-1.5.2-sighup.patch |   10 +
 ucarp.spec               |   13 +-
 vip-001.list.example     |   11 -
 vip-helper.sh            |   28 -
 5 files changed, 22 insertions(+), 1696 deletions(-)
---