unused method
Merge branch 'master' into ice-cream-sandwich
synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich
multidirs branch has gone
Merge branch 'master' into ice-cream-sandwich
entry dulication protection
Merge branch 'master' into ice-cream-sandwich