[vnstat/el6/master: 10/10] Merge branch 'master' into el6

[Adrian Reber]

commit af67fb8744cd82725d9fdc3cf8b6572ad02c1c43
Merge: e210529 7bbe34c
Author: Adrian Reber <adrian at lisas.de>
Date:   Mon Apr 4 15:11:03 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 sources     |    2 +-
 vnstat.spec |  118 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 93 insertions(+), 27 deletions(-)
---