From db21f663fe6d0ebfd19626d10bd1ad742d7c3af4 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 29 Oct 2012 08:59:54 -0500
Subject: [PATCH] fixed issue 1120, bug introduced in latest utils.py import.
 thanks Yair

---
 VERSION        | 2 +-
 gluon/utils.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 20cd35e4..40b6cc5b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.2.1 (2012-10-29 08:57:40) stable
+Version 2.2.1 (2012-10-29 08:59:50) stable
diff --git a/gluon/utils.py b/gluon/utils.py
index 52f8a58b..d2ee474d 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -37,7 +37,7 @@ try:
 except ImportError:
     try:
         from .aes import AES
-    except ImportError:
+    except (ImportError, ValueError):
         from contrib.aes import AES
 
 try: