[dkms/el5: 4/4] Merge branch 'master' into el5

[Simone Caronni]

commit b15e58c36d89928e83b0e00256b65752ad9f8b67
Merge: a78cf02 c94c97d
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Sun Jul 21 15:38:47 2013 +0200

    Merge branch 'master' into el5

 dkms.service |    2 +-
 dkms.spec    |   19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)
---