[python-beaker/el5: 17/17] Merge branch 'master' into el5

[Toshio くらとみ]

commit 995a50325014a185712d62ab94a69f356bb2eef2
Merge: f662c85 84da454
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Sep 7 15:06:33 2011 -0700

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	python-beaker.spec
    	sources

 .gitignore                    |    2 +-
 beaker-anydbm.patch           |   12 ++++
 beaker-disable-badtest.patch  |   18 ++++++
 beaker-use-system-paste.patch |   58 ++++++++++++++++++
 python-beaker-absimport.patch |    7 --
 python-beaker.spec            |  130 ++++++++++++++++++++++++++++++++++++++--
 sources                       |    2 +-
 7 files changed, 213 insertions(+), 16 deletions(-)
---
diff --cc .gitignore
index b22e668,3c7cd12..a21f938
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Beaker-1.5.3.tar.gz
+ /Beaker-1.5.4.tar.gz