Initial legwork for porting to ubuntu 12.04