Bold font in Xdefaults
Merge branch 'master' of git://github.com/opatut/dotfiles

Conflicts:
	Xdefaults