Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Redirect warnings to the logging system on python versions >= 2.6  Refs #3135.
Fix python version checking. Refs #3135
Added Gentoo support to locale
Fixed return for set_locale when os is Gentoo
Fixed return for get_locale if os is Gentoo
Add service dependency
Fix indents to make @s0ndt3ch happy
Merge pull request #3146 from s0undt3ch/issues/3135

Redirect warnings to the logging system on python versions >= 2.6  Refs #3135
Merge pull request #3151 from shadowfax-chc/locale

Locale for Gentoo
Added Gentoo support to keybpard module
Merge pull request #3152 from shadowfax-chc/keymap

Added Gentoo support to keyboard module
Added Gentoo support for timezone module