addswap
addswap
addswap
addswap
addswap
Minor change in Doc
Merge branch 'pr248'

Conflicts:
	nilearn/image/__init__.py