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

[Simone Caronni]

commit 5d5e2dc10a7142d88227c9af6e827c53f1dd92cc
Merge: 24420fb 30cb31e
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Aug 29 15:36:03 2013 +0200

    Merge branch 'master' into el5

 dkms-fix-mkrpm.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---