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

[Ricardo Rocha]

commit bfdd8cf025d3e8a8d067d42ad14bbfaf1a11e30f
Merge: 3a18465 5e6752e
Author: Ricardo Rocha <rocha.porto at gmail.com>
Date:   Tue Jun 12 18:49:00 2012 +0200

    Merge branch 'master' into f17

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