version 321.21.6
.gitignore added
Merge remote-tracking branch 'mainline/master'

Updated to OS X 10.8.4 code