[bugzilla/el6: 15/15] Merge branch 'f13' into el6

[Xavier Bachelot]

commit 878a5ae92fefd5e5dbf7494d631c9f696d599672
Merge: 0a9e3b1 9739db2
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Mon Jul 18 00:25:02 2011 +0200

    Merge branch 'f13' into el6
    
    Conflicts:
    	.gitignore
    	bugzilla.spec
    	sources

 .gitignore              |    5 ++++
 bugzilla-rw-paths.patch |   10 ++++----
 bugzilla.spec           |   53 +++++++++++++++++++++++++++++++++++++++++++---
 sources                 |    2 +-
 4 files changed, 60 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index b5354fa,078619f..e5b63e3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,6 @@@
 +bugzilla-3.4.5.tar.gz
+ bugzilla-3.4.7.tar.gz
+ /bugzilla-3.4.8.tar.gz
+ /bugzilla-3.4.9.tar.gz
+ /bugzilla-3.4.10.tar.gz
+ /bugzilla-3.4.11.tar.gz