book uid (in progress)
Merge branch 'master' into android-1.5