[clearsilver/el5: 35/35] Merge branch 'el6' into el5

[Jon Ciesla]

commit c3d545f9af266d860c67bdeb298eaaabee77c859
Merge: 2ca5470 b4f2890
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Dec 12 08:56:24 2011 -0600

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	clearsilver.spec
    	sources

 .gitignore                             |    2 +-
 clearsilver-0.10.2-fedora.patch        |  118 --------------------------------
 clearsilver-0.10.5-CVE-2011-4357.patch |   13 ++++
 clearsilver-0.10.5-fedora.patch        |   80 +++++++++++++++++++++
 clearsilver-0.10.5-regression.patch    |   12 +++
 clearsilver.spec                       |   69 ++++++++++++++++---
 sources                                |    2 +-
 7 files changed, 166 insertions(+), 130 deletions(-)
---