Merge branch 'master' of https://github.com/buren/enduro into java1_6
Merge branch 'master' of https://github.com/buren/enduro into java1_6
Merge branch 'master' of https://github.com/buren/enduro into java1_6
Merge branch 'java1_6' of https://github.com/buren/enduro into java1_6
Merge branch 'master' of https://github.com/buren/enduro into java1_6
Merge pull request #122 from buren/java1_6

Java1 6
Merge branch 'master' of https://github.com/buren/enduro into java1_6