[perl-Test-LeakTrace/f13/master: 6/8] Merge branch 'master' (early part) into f13

[Paul Howarth]

commit 10d6dc61de6a7ed333a400f68c6377de409ec05b
Merge: 838ee27 3b616df
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Nov 17 14:56:02 2010 +0000

    Merge branch 'master' (early part) into f13
    
    Conflicts:
    	perl-Test-LeakTrace.spec

---