revert 9533, we aren't ready to base freenas on a development branch yet
Authored by: jpaetzel 2012-01-14
Parent: [r9537]
Child: [r9539]