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

[Paul Howarth]

commit 1a05fa0d5f407d829e2f6f7f2ea8b7efcc6aed20
Merge: 77a0765 3b616df
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Nov 18 09:20:16 2010 +0000

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

---