Merge commit 'f01f63fda8a6e4579f4d874e605094ad99034137' into tidy-up-jdk6
Merge commit '7811d323a6ee61fabf9dcf2a30359b7556620e86' into tidy-up-jdk6
Add generic types to List and Iterator.
Merge pull request #30 from rankinc/tidy-up-jdk6

Tidy up jdk6.  Reviewed.
Merge branch 'master' into 3.0.0-Omnifone