another merge from HEAD to 2.1 branch

[Peter Lin]

Once we get a patched release of 2.1 out, I want to merge the include 
controller to the 2.1 branch so that people can use it without jdk1.5.

peter