fixes
Merge branch 'master' into pruebas

Conflicts:
	sys-kernel/aufs-sources/aufs-sources-3.10.12.ebuild
add dev-python/dropboxindex

Package-Manager: portage-2.2.6
Manifest-Sign-Key: C406BA7E