[perl-Kwiki/el6: 11/11] Merge branch 'master' into el6

[Steven Pritchard]

commit 9d0a2dbe9ea6e142a670a8d941b3cc6bd4a28fec
Merge: 35e5965 c2c01ea
Author: Steven Pritchard <steven.pritchard at gmail.com>
Date:   Sun Oct 2 16:39:33 2011 -0500

    Merge branch 'master' into el6

 Kwiki-filter-requires.sh |    3 --
 perl-Kwiki.spec          |   47 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 39 insertions(+), 11 deletions(-)
---