[ibmonitor/el6/master: 5/5] Merge branch 'master' into el6

[Adrian Reber]

commit 7ec40a7c6052e7622d143bc2148f9e4b29981a25
Merge: 938b10d a807906
Author: Adrian Reber <adrian at lisas.de>
Date:   Thu Mar 31 22:42:06 2011 +0200

    Merge branch 'master' into el6

 ibmonitor.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---