# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1277962439 25200
# Node ID 8ba2f10878808c4d4c935564c66853434949e2ef
# Parent  89f7a8ca965c2284721c05895c9bb82f5e9a7ad8# Parent  677e2fe1239c6e10afd85c83bcd6996dfdb434a7
and a commit following a merge, goody goody...lets get a snack

diff -r 89f7a8ca965c -r 8ba2f1087880 decoupage/formatters.py
--- a/decoupage/formatters.py	Wed Jun 30 22:33:26 2010 -0700
+++ b/decoupage/formatters.py	Wed Jun 30 22:33:59 2010 -0700
@@ -132,6 +132,10 @@
         for f in data['files']:
             if f['description'] and self.separator in f['description']:
                 title, description = f['description'].split(self.separator, 1)
+                title = title.strip()
+                description = description.strip()
+                if not title:
+                    title = f['name']
                 f['title'] = title
                 f['description'] = description
             else:
diff -r 89f7a8ca965c -r 8ba2f1087880 setup.py
--- a/setup.py	Wed Jun 30 22:33:26 2010 -0700
+++ b/setup.py	Wed Jun 30 22:33:59 2010 -0700
@@ -6,7 +6,7 @@
 except IOError:
     description = ''
 
-version = '0.7'
+version = '0.7.1'
 
 setup(name='decoupage',
       version=version,
@@ -15,8 +15,8 @@
       classifiers=[], # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
       author='Jeff Hammel',
       author_email='k0scist@gmail.com',
-      url='http://explosivedecompression.net',
-      license="",
+      url='http://k0s.org',
+      license="GPL",
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
       zip_safe=False,