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

[Ricardo Rocha]

commit 51352aaa8484179b3faa2834927cb5b39da7d36c
Merge: bfdd8cf 7df24cd
Author: rochaporto <rocha.porto at gmail.com>
Date:   Fri Jul 27 12:11:07 2012 +0200

    Merge branch 'master' into f17

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