Define, when possible, the inventory_dir variable
Add state to rhn_channel docs
Merge branch 'ansible_inventory_basedir' of git://github.com/stoned/ansible into test_basedir

Conflicts:
	lib/ansible/runner/__init__.py
Resolve merge commit.
Add state to rhn_channel docs
Merge branch 'test_basedir' into devel