IE6 bug fix
IE6 布局混乱修复
Merge branch 'master' into gh-pages

Conflicts:
	skin/global.css