[wordpress-plugin-bad-behavior/el5/master: 9/9] Merge branch 'master' into el5

[Nick Bebout]

commit 6ecc4a60310b6b115014e965c580187a9f222ff7
Merge: d5b777f 75a332e
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Mar 3 21:33:23 2011 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources
    	wordpress-plugin-bad-behavior.spec

 .gitignore                         |    3 +-
 sources                            |    2 +-
 wordpress-plugin-bad-behavior.spec |   64 ++++++++---------------------------
 3 files changed, 18 insertions(+), 51 deletions(-)
---
diff --cc .gitignore
index 1a3c311,7ad0a80..000f298
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
--bad-behavior.2.0.36.zip
+ /bad-behavior.2.0.38.zip
+ /bad-behavior.2.0.42.zip