Commit d4d648b042b726a03611063212069adb061e863e

nulltoken 2012-04-11T15:25:34

Fix compilation errors and warnings