pushing Revision 921 from SVN based https://code.google.com/p/android-casual/source/detail?r=921