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

[Ricardo Rocha]

commit fd076b8ae11323fb19d56bed00002f17e8bbaece
Merge: 51ffb6b 6146795
Author: Ricardo Rocha <rocha.porto at gmail.com>
Date:   Mon Jun 11 18:56:03 2012 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	dpm-contrib-admintools.spec

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