[perl-Return-Value/el6/master: 6/6] Merge remote branch 'origin/master' into el6/master

[Paul Howarth]

commit 846a6c5a44462e4ce574c8e656d62fc26fe2d4f6
Merge: 9ff3d6e 112705b
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Aug 23 10:44:49 2010 +0100

    Merge remote branch 'origin/master' into el6/master
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---