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

[Jon Ciesla]

commit bccd0661b4c4d779b8ff644dd03ebcec88631b0b
Merge: 9c1d25c 989723d
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Nov 22 08:39:58 2011 -0600

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

 findthatword.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---