=
=
=
=
=
=
=
=
=
=
Merge branch 'master' of https://github.com/mc007/xjs

Conflicts:
	src/lib/dijit
	src/lib/dojox
=asdf