On branch master (milestone)

- teapot ready
Merge branch 'master' of https://github.com/lihw/glf

Conflicts:
	configs/msvc2010/glf.suo