Matthew Rhoten - 2010-01-04

unified diff of linux build changes