[dpm-contrib-admintools/el5: 2/2] Merge branch 'master' into el5

[Ricardo Rocha]

commit d0229b5478b13f83304fe02772c5a2f5aef36878
Merge: fd076b8 5e6752e
Author: Ricardo Rocha <rocha.porto at gmail.com>
Date:   Tue Jun 12 18:49:43 2012 +0200

    Merge branch 'master' into el5

 dpm-contrib-admintools.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---