[vnstat/f16: 2/2] Merge branch 'master' into f16

[Adrian Reber]

commit e02e5de91f841cc6f3e7a353b62e50088f6fe239
Merge: dbcb38c e11a4e4
Author: Adrian Reber <adrian at lisas.de>
Date:   Fri Dec 23 11:33:01 2011 +0100

    Merge branch 'master' into f16

 vnstat.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---