[perl-Plack/f14/master: 10/10] Merge remote-tracking branch 'origin/master' into f14/master

[corsepiu]

commit 888e70bd42cb387b862a06d9ccd89586e909414d
Merge: f8b26cf 0b5ed3f
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Sat Mar 26 06:47:07 2011 +0100

    Merge remote-tracking branch 'origin/master' into f14/master
    
    Conflicts:
    	.gitignore
    	perl-Plack.spec
    	sources

 .gitignore      |    1 +
 perl-Plack.spec |   13 ++++++++++---
 sources         |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---