[gallery2/el5: 39/39] Merge branch 'master' into el5

[Jon Ciesla]

commit ca59190ae4861a017b3eeb6ed39ea1cb60b40477
Merge: 95376b6 e62102d
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Apr 12 12:18:47 2012 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	gallery2.spec
    	sources

 .gitignore                    |    2 +-
 gallery2-2.3.1-jpegtran.patch |   11 ++++++++++
 gallery2.spec                 |   45 +++++++++++++++++++++++++++++++++++-----
 sources                       |    2 +-
 4 files changed, 52 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index 233079c,b368135..4dc0509
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- gallery-2.2.svn.tar.gz
 -gallery-2.3.1-jarless.tar.gz
+ /gallery-2.3.2-jarless.tar.gz