Move config/xx_XX to config/xx
Merge branch 'master' of github.com:benoitfragit/google2ubuntu