Merged trunk and resolved conflicts.

1 files changed, 1 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index ec0014478..d88bc1e6f 100644
--- a/setup.py
+++ b/setup.py
@@ -57,6 +57,7 @@ setup(name='nova',
       cmdclass={ 'sdist': local_sdist,
                  'build_sphinx' : local_BuildDoc },
       packages=find_packages(exclude=['bin', 'smoketests']),
+      include_package_data=True,
       scripts=['bin/nova-api',
                'bin/nova-compute',
                'bin/nova-dhcpbridge',