Merging our git branch to svn
I really thought there were more files, but apparantly just kernel.cu was modified. Maybe this is correct, but I could have made an error on the git side when merging the svn commits.
Authored by: andrewbelt 2014-02-05
Parent: [r165]
Child: [r167]