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

[Simone Caronni]

commit 0cae82f33e9ed56c19020e83243cef9aac4db215
Merge: dfe544d 111e286
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 22 13:06:25 2013 +0200

    Merge branch 'master' into el5

 dkms.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---