[vdrift/f18: 3/3] Merge branch 'master' into f18

[Jon Ciesla]

commit 1a4758381d64423880a2b7344cecd76f57241fd5
Merge: 737490f 252e822
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Oct 24 12:14:22 2012 -0500

    Merge branch 'master' into f18
    
    Conflicts:
    	vdrift.spec

 .gitignore                               |    1 +
 sources                                  |    2 +-
 vdrift-2012-07-22c_bullet281_patch.patch |  889 ++++++++++++++++++++++++++++++
 vdrift.spec                              |   14 +-
 4 files changed, 900 insertions(+), 6 deletions(-)
---