*** __init__.py.orig	Mon Nov  6 17:29:03 2006
--- __init__.py	Mon Nov  6 17:29:08 2006
***************
*** 247,253 ****
                  var_node = self.create_variable_node(filter_expression)
                  self.extend_nodelist(nodelist, var_node,token)
              elif token.token_type == TOKEN_BLOCK:
!                 if token.contents in parse_until:
                      # put token back on token list so calling code knows why it terminated
                      self.prepend_token(token)
                      return nodelist
--- 247,253 ----
                  var_node = self.create_variable_node(filter_expression)
                  self.extend_nodelist(nodelist, var_node,token)
              elif token.token_type == TOKEN_BLOCK:
!                 if token.contents.split()[0] in parse_until:
                      # put token back on token list so calling code knows why it terminated
                      self.prepend_token(token)
                      return nodelist