[perl-Software-License: 6/7] Pseudo-merge for dist-git setup

[Iain Arnell]

commit a38830df009327215794791d7a957dcd5652042b
Merge: 4136c1d 7316a4d
Author: Iain Arnell <iarnell at gmail.com>
Date:   Sat Sep 3 11:13:06 2011 +0200

    Pseudo-merge for dist-git setup
    
    el6 branch should really be tracking master

---