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

[Ricardo Rocha]

commit ec04f0ef8d646bf5d2fc0ab5ff3029411367fe1f
Merge: d0229b5 7df24cd
Author: rochaporto <rocha.porto at gmail.com>
Date:   Fri Jul 27 12:11:34 2012 +0200

    Merge branch 'master' into el5

 .gitignore                  |    1 +
 dpm-contrib-admintools.spec |   14 ++++++++++----
 sources                     |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---