Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	lib/ansible/runner/__init__.py
	lib/ansible/utils/__init__.py
	test/TestPlayBook.py

Look for a file with the base name of the group/host, first without
a file extension, then with a '.yml' extension, and, finally, with
a '.yaml' extension, loading vars from only the first one found.

Ec2 vol improvements

Minor fixes to the rax module

Make more lookup plugins tolerant of new variable system, with a little better 'do what I mean' logic to resolving
what happens if you get a string back as a template result.

Make more lookup plugins happy with newstyle variables.  Not quite done, but this fixes up with_items/with_nested/file/fileglob.

Atomic replace and cron

work across filesystems

means ln and os.rename() won't work across fs.

Even though others are possible, fail early on unsupported ones.

Only list the services supported
Don't put in unncessary required: false
Use better formatting for the example

Proposal for a module to manage PostgreSQL privileges (2)

user module: return public SSH key

This Module allows to manage privileges on PostgreSQL database objects
(currently: tables, sequences, functions, databases, schemas, languages and
tablespaces) as well as group role memberships.

It is basically a wrapper around most of the functionality of PostgreSQL's
GRANT and REVOKE statements with additional detection of changes and support
for dry-runs (check-mode).

postgresql_privs should work with PostgreSQL 8.4 and above. Python Module
psycopg2 is required on the remote host.

Return public SSH key if the user module is called with generate_ssh_key=yes.
Since "user" doesn't overwrite files, this also allows querying of existing
public keys.

Used in playbooks together with the "register" keyword, the returned key can be
passed to the "authorized_key" module allowing easy setup of SSH public key
authentication between remote hosts.

Use psycopg2's string handling to escape password string

Errors in Riak documentation.

Added catch-all exception for riak stats collection.

Explain conditionals as applied to roles.  I could also explain with_items but the scope questions are complex
here, and it is better to include such loops inside the imported tasks.

Prevent premature variable substitution in tasks

Quick fix for first_available_file and role support