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

[Simone Caronni]

commit 550a7d3561fee2d3bd529eec7e9f7ffa15e25771
Merge: 5d5e2dc 78992dd
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Aug 29 16:05:30 2013 +0200

    Merge branch 'master' into el5

 dkms-fix-mkrpm.patch |    4 ++--
 dkms.spec            |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---