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

[Rex Dieter]

commit fb353269bd6db626d992aece5e5960038a45b4b1
Merge: 5cfe69e 4e45867
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 7 10:06:27 2013 -0600

    Merge branch 'el6' into el5
    
    Conflicts:
    	lsyncd.spec

 lsyncd.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---