--- nova/api/ec2/cloud.py.orig  2012-10-31 15:58:27.905773055 +0100
+++ nova/api/ec2/cloud.py       2012-10-31 16:37:58.515588746 +0100
@@ -1178,6 +1178,7 @@
             try:
                 # always filter out deleted instances
                 search_opts['deleted'] = False
+                search_opts['project_id'] = context.project_id
                 instances = self.compute_api.get_all(context,
                                                      search_opts=search_opts,
                                                      sort_dir='asc')