Add note about new logging feature in example plugin.
Update changelog
Merge branch 'setup-dmidecode' of git://github.com/dagwieers/ansible into testing_427
Merge pull request #2610 from peterjanes/devel

Basic RDS support for EC2 inventory
Merge branch 'devel' of git://github.com/iliv/ansible into testing_427
Updated ansible.spec should now work for CentOS 5 and CentOS 6

Signed-off-by: Ivan Lezhnjov IV <ivan.lezhnjov.iv@gmail.com>
Fixes wrong Source URL

Signed-off-by: Ivan Lezhnjov IV <ivan.lezhnjov.iv@gmail.com>
Implement python-dmidecode/dmidecode as alternative for kernel DMI

This implementation falls back to python-dmidecode (RHEL5.5+) if the kernel as no DMI support. Alternatively, if python-dmidecode is missing, we attempt to use the dmidecode binary (for RHEL5.4 and older) before giving up.

This fixes #376 and #1657 and also helps @lwade on RHEL5.5+.
Merge pull request #2702 from DazWorrall/devel

Add define command to virt module
Add virt guest creation to virt module docs
Merge branch 'numeric_ids_refactor' of git://github.com/insom/ansible into testing_427
Merge branch 'testing_427' into devel
Merge branch 'nocows' of git://github.com/jpmens/ansible into devel

Conflicts:
	lib/ansible/callbacks.py
	lib/ansible/constants.py
Merge branch 'yum-module' of git://github.com/Tinche/ansible into testing_427
Merge branch 'testing_427' into devel
Merge pull request #2758 from lonerr/service

FreeBSD startup scripts (rc) supports optional arguments.
Changed atomic_replace to atomic_move, now ti DOES move atomically in the last
step
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
Merge branch 'roles_dir_search_order' of git://github.com/mcodd/ansible into devel
Cows don't need to display brackets around strings.
Document variables are reserved.