[perl-Try-Tiny/f13/master: 5/6] Merge branch 'master' (early part) into f13

[Paul Howarth]

commit 1750396595bf83880f0e69425b016dfe91d42c6e
Merge: fbf7a39 2dc9161
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Nov 17 15:31:35 2010 +0000

    Merge branch 'master' (early part) into f13
    
    Conflicts:
    	.gitignore
    	perl-Try-Tiny.spec

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 13e3751,4ef0f65..73d408c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- Try-Tiny-0.02.tar.gz
 -Try-Tiny-0.04.tar.gz
++/Try-Tiny-0.04.tar.gz