[vnstat/el6: 2/2] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit a32a1dda56aedea9d4a075b35de3c2e18cc7d352
Merge: af67fb8 dc4feb5
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Jun 2 14:20:38 2011 +0200

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

 .gitignore  |    2 +-
 sources     |    2 +-
 vnstat.spec |    7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---