aditsu - 2010-11-15

Hi, please check the latest code in the CodeUpdateAndJava5 branch