2011 GSoC Driver Backports