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

[Adrian Reber]

commit 6e4c7a3e854fc4e3f08f979cddf2978ccb647734
Merge: e02e5de 59b7827
Author: Adrian Reber <adrian at lisas.de>
Date:   Fri Dec 23 16:34:39 2011 +0100

    Merge branch 'master' into f16

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