[httpretty] 0.5.10 keyworded x86.

Package-Manager: portage-2.1.11.55
Manifest-Sign-Key: C0174749
[vanity] 1.2.4 keyworded x86.

Package-Manager: portage-2.1.11.55
Manifest-Sign-Key: C0174749
Merge branch 'feat/x86_keywording' into feat/amd64_keywording

* feat/x86_keywording:
  [vanity] 1.2.4 keyworded x86.
  [httpretty] 0.5.10 keyworded x86.

Conflicts:
	dev-python/httpretty/ChangeLog
	doc/packages/dev-python.rst
[httpretty] 0.5.10 keyworded amd64.

Package-Manager: portage-2.1.11.55
Manifest-Sign-Key: C0174749
[vanity] 1.2.4 keyworded amd64.

Package-Manager: portage-2.1.11.55
Manifest-Sign-Key: C0174749
Updated metadata cache for upstream's eclass changes.
Merge branch 'feat/x86_keywording'

* feat/x86_keywording:
  [vanity] 1.2.4 keyworded x86.
  [httpretty] 0.5.10 keyworded x86.

Conflicts:
	dev-python/httpretty/ChangeLog
	doc/packages/dev-python.rst
	metadata/md5-cache/dev-python/httpretty-0.5.10
	metadata/md5-cache/dev-python/vanity-1.2.4
Merge branch 'feat/amd64_keywording'

* feat/amd64_keywording:
  [vanity] 1.2.4 keyworded amd64.
  [httpretty] 0.5.10 keyworded amd64.

Conflicts:
	dev-python/httpretty/ChangeLog
	doc/packages/dev-python.rst
	metadata/md5-cache/dev-python/httpretty-0.5.10
	metadata/md5-cache/dev-python/httpretty-0.5.9
	metadata/md5-cache/dev-python/vanity-1.2.3