add better OS detection for BDM
adding windows-specific ebs recommendation
Define, when possible, the inventory_dir variable
Fix reinplace in macports package to work on both 10.7 and 10.8

reinplace on OSX 10.8 seems to behave differently, this change has been tested
on a few 10.8 and 10.7 machines.
Allow conditionals on BYPASS_HOST_LOOP plugins like add_host
Ensure that when transferring a file to a directory the name of the file is the correct basename and not 'source'.
Add state to rhn_channel docs
Merge pull request #2498 from jcftang/devel

Fix reinplace in macports package to work on both 10.7 and 10.8
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
update changelog
Let the callbacks see the playbook and (current) runner objects.
Update changelog
Upgrade callbacks further, now '.play', '.task', and so on are also available!
Remove authors file from version control (can still be built from 'make authors')
add authors file to gitignore since it was removed from version control
add clean up authors file to make clean
"gem"-module: replace python 2.5 language feature

replace conditional expression with python 2.4-compatible if/else
statements