Fixed BZ#1140879 - Builds fail when using Java 6.