Pit Palme - 2010-02-16

Add Java5+ compatibility