merge with trunk and resolve conflicts

1 files changed, 2 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index 6c45109bc..194b55183 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import gettext
 import glob
 import os
 import subprocess
@@ -33,6 +34,7 @@ except ImportError:
 assert DistUtilsExtra.auto.__version__ >= '2.18',\
        'needs DistUtilsExtra.auto >= 2.18'
 
+gettext.install('nova', unicode=1)
 
 from nova.utils import parse_mailmap, str_dict_replace
 from nova import version