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

[Simone Caronni]

commit 5abb20ff95027d0fcdb3d95edc255c41da409b88
Merge: 0cae82f 13a55a2
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 22 13:20:04 2013 +0200

    Merge branch 'master' into el5

 dkms.spec |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)
---