stupid qt/trolltech caches library info in config. constant merging
sucks.
Merge branch 'master' of ssh://github.com/mshade/dotfiles

Conflicts:
	.config/Trolltech.conf-template