- for merging origin master
Merge branch 'master' of https://github.com/lihw/glf

Conflicts:
	configs/msvc2010/glf.suo
	demos/grass/msvc2010/grass.suo
Merge branch 'master' of https://github.com/lihw/glf
On branch master (temp

- for merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	demos/grass/msvc2010/grass.suo