Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread * commit '5b86de94a163ce4c52ab08a9820f9d78414e1767': fix doc bugs
Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread * commit '5b86de94a163ce4c52ab08a9820f9d78414e1767': fix doc bugs