When constructing the sidebar don't overide 'sidebar' Instead specify 'sidebar_additional' and include it even if there is a 'sidebar' defined. Patch by: Sverre Rabbelier

from query import *
from subqueries import *
from where import AND, OR
from datastructures import EmptyResultSet

__all__ = ['Query', 'AND', 'OR', 'EmptyResultSet']