[bwbar/el6/master: 2/2] Merge branch 'master' into el6

[Adrian Reber]

commit f76f34af4739116335448f215e4870c185b2a18f
Merge: 84a247c 4498ed0
Author: Adrian Reber <adrian at lisas.de>
Date:   Thu Mar 31 22:57:24 2011 +0200

    Merge branch 'master' into el6

 bwbar.debian-020_proc_net_2.6.x_fix.patch |    4 ++--
 bwbar.spec                                |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---