From 4168002a58ad2a08e24011e281963401ed7c7ad3 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Tue, 3 Mar 2015 11:05:13 -0600
Subject: [PATCH] allow imports form gluon/dal.py

---
 gluon/dal.py       | 4 +++-
 gluon/packages/dal | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gluon/dal.py b/gluon/dal.py
index 8bfcac02..a2eb088b 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -11,7 +11,9 @@ Takes care of adapting pyDAL to web2py's needs
 """
 
 from pydal import DAL as pyDAL
-from pydal import Field, SQLCustomType, geoPoint, geoLine, geoPolygon
+from pydal import Field
+from pydal.objects import Row, Rows, Table, Query, Expression
+from pydal import SQLCustomType, geoPoint, geoLine, geoPolygon
 
 
 def _default_validators(db, field):
diff --git a/gluon/packages/dal b/gluon/packages/dal
index 2f513d83..3a0b4645 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit 2f513d830cbe3ec1c2b3670bc04de509e52fe21e
+Subproject commit 3a0b4645ca868d3583f19ed1947f889e60d4543e