On branch master (temp)
Merge remote-tracking branch 'origin/master'

Conflicts:
	configs/msvc2010/glf.suo