Commit 7ae8ee8dc3bc55ce171b2125c7b7f26801afc608

Con Kolivas 2013-09-26T21:29:30

Merge commit 'b606a60349fe2f1c1c56a1fec833ec849b798676' into redfury Conflicts: driver-bitfury.c