Added python-unittest2 build requirement
Merge branch 'master' of github.com:pynag/pynag
Merge branch 'master' of github.com:pynag/pynag

Conflicts:
	pynag.spec