[clearsilver/el6: 5/5] Merge branch 'master' into el6

[Jon Ciesla]

commit b4f28905754046f81994b183dbb78842183fb097
Merge: 2e6edb1 10cc46e
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Dec 12 08:34:19 2011 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	clearsilver.spec

 clearsilver-0.10.5-CVE-2011-4357.patch |   13 +++++++++++++
 clearsilver.spec                       |   17 ++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
---