Commit cef90ab0ff05384a30328e00034e455ebbe3f15d

ckolivas 2012-02-10T17:02:26

Merge branch 'kernels' into diablo