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

[Nick Bebout]

commit 5b777783f13b4c2097e4daf800127c059374a895
Merge: 169ad7a 75a332e
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Mar 3 21:31:46 2011 -0600

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

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