unused method
Merge branch 'master' into android-1.5
synchronization with beta branch
Merge branch 'master' into android-1.5
multidirs branch has gone
Merge branch 'master' into android-1.5
entry dulication protection
Merge branch 'master' into android-1.5