sync with offical docs at 20130122
Merge branch 'upstream'

Conflicts:
	xsls/style.xsls
	xslt/style.xslt