merged with master and working as of 6/18/09
merged with master and working as of 6/18/09

sirikata/sirikata,sirikata/sirikata,robertkhamilton/sirikata,sirikata/sirikata,robertkhamilton/sirikata,sirikata/sirikata,sirikata/sirikata,robertkhamilton/sirikata,sirikata/sirikata,sirikata/sirikata,sirikata/sirikata