[perl-Text-vFile-asData/el6/master: 9/9] Merge branch 'master' into el6

[Xavier Bachelot]

commit 90e4990e13ecb0428213b0d23db44e2f1810ab65
Merge: 94c5957 abee3b4
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Sun Dec 19 15:35:34 2010 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 perl-Text-vFile-asData.spec |   49 ++++++++++++++++++++++++------------------
 sources                     |    2 +-
 2 files changed, 29 insertions(+), 22 deletions(-)
---