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

[Simone Caronni]

commit 870ead84e8a9de865ed5e2ac9193f6b09b570cd1
Merge: 8c9c4e2 0d2890d
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jan 17 14:24:49 2014 +0100

    Merge branch 'master' into el5

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