problem with salt pillars with multiple pillar_roots:

At the bottom of this paste is the error message I'm getting...

# In my /etc/salt/master
file_roots:
  base:
    - /srv/salt/base
  test:
    - /srv/salt/test
  dbaas:
    - /srv/salt/dbaas

pillar_roots:
  base:
    - /srv/salt/base
  test:
    - /srv/salt/test
  dbaas:
    - /srv/salt/dbaas

#--------- cut -------
# Structure of my file_roots:

/srv/salt
|-- base
|   |-- ntp
|   |   |-- init.sls
|   |   `-- ntp.conf
|   |-- packages.sls
|   |-- top.sls
|-- dbaas
`-- test
    `-- simple_stack
        |-- bin
        |   |-- install-compute-node.sh
        |   `-- install-controller-node.sh
        |-- compute.sls
        |-- controller.sls
        |-- environment.sls
        |-- envs
        |   `-- environment.jinja
        `-- init.sls

#--------- cut -------
# Structure of my pillar_roots:

/srv/pillar
|-- base
|   |-- locked.sls
|   `-- top.sls
|-- dbaas
`-- test
    `-- simple_stack
        `-- init.sls

#--------- cut -------
# Contents of /srv/salt/base/top.sls
base:
  '*':
    - ntp
    - packages

test:
  'ps-aw2az2-compute001[1,2,3].*':
    - simple_stack
    - simple_stack.environment
  'ps-aw2az2-compute0011.*':
    - simple_stack.controller
  'ps-aw2az2-compute001[2,3].*':
    - simple_stack.compute

#--------- cut -------
# Contents of /srv/pillar/base/top.sls

base:
  '*':
    - locked
test:
  'ps-aw2az2-compute.*':
    - simple_stack

#--------- cut -------
# Error message trying to sync pillar data
# salt '*' saltutil.refresh_pillar

2013-03-13 20:23:29,001 [salt.pillar      ][CRITICAL] Pillar render error: Rendering SLS simple_stack failed, render error:
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.7/salt/utils/templates.py", line 55, in render_tmpl
    output = render_str(tmplstr, context, tmplpath)
  File "/usr/lib/pymodules/python2.7/salt/utils/templates.py", line 98, in render_jinja_tmpl
    output = jinja_env.from_string(tmplstr).render(**context)
  File "/usr/lib/python2.7/dist-packages/jinja2/environment.py", line 894, in render
    return self.environment.handle_exception(exc_info, True)
  File "<template>", line 43, in top-level template code
  File "/usr/lib/python2.7/dist-packages/jinja2/environment.py", line 353, in getitem
    return obj[argument]
UndefinedError: 'dict object' has no attribute 'simple_stack'

2013-03-13 20:23:29,002 [salt.pillar      ][CRITICAL] Pillar render error: Rendering SLS simple_stack failed, render error:
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.7/salt/utils/templates.py", line 55, in render_tmpl
    output = render_str(tmplstr, context, tmplpath)
  File "/usr/lib/pymodules/python2.7/salt/utils/templates.py", line 98, in render_jinja_tmpl
    output = jinja_env.from_string(tmplstr).render(**context)
  File "/usr/lib/python2.7/dist-packages/jinja2/environment.py", line 894, in render
    return self.environment.handle_exception(exc_info, True)
  File "<template>", line 43, in top-level template code
  File "/usr/lib/python2.7/dist-packages/jinja2/environment.py", line 353, in getitem
    return obj[argument]
UndefinedError: 'dict object' has no attribute 'simple_stack'

2013-03-13 20:23:29,163 [salt.pillar      ][CRITICAL] Pillar render error: Rendering SLS simple_stack failed, render error:
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.7/salt/utils/templates.py", line 55, in render_tmpl
    output = render_str(tmplstr, context, tmplpath)
  File "/usr/lib/pymodules/python2.7/salt/utils/templates.py", line 98, in render_jinja_tmpl
    output = jinja_env.from_string(tmplstr).render(**context)
  File "/usr/lib/python2.7/dist-packages/jinja2/environment.py", line 894, in render
    return self.environment.handle_exception(exc_info, True)
  File "<template>", line 43, in top-level template code
  File "/usr/lib/python2.7/dist-packages/jinja2/environment.py", line 353, in getitem
    return obj[argument]
UndefinedError: 'dict object' has no attribute 'simple_stack'