# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1346216614 25200
# Node ID d98c9e7415c30b70bb5bb4df7069da7d8d5ea802
# Parent  5a3945882d043d42fc9accf08cb1d952eb8d96e4
better importing

diff -r 5a3945882d04 -r d98c9e7415c3 montage/formatters.py
--- a/montage/formatters.py	Wed Jan 11 16:28:16 2012 -0800
+++ b/montage/formatters.py	Tue Aug 28 22:03:34 2012 -0700
@@ -4,10 +4,15 @@
 
 import mimetypes
 import os
-import Image
 from cropresize import crop_resize
 from decoupage.formatters import FormatterBase
 
+# PIL
+try:
+    import Image
+except:
+    from PIL import Image
+
 class Images(FormatterBase):
     """display images with thumbnails"""
 
diff -r 5a3945882d04 -r d98c9e7415c3 setup.py
--- a/setup.py	Wed Jan 11 16:28:16 2012 -0800
+++ b/setup.py	Tue Aug 28 22:03:34 2012 -0700
@@ -1,7 +1,7 @@
 import os
 from setuptools import setup, find_packages
 
-version = '0.3.5'
+version = '0.3.6'
 
 try:
     description = file(os.path.join(os.path.dirname(__file__), 'README.txt')).read()