Commit 529df4dfe54c61b40b96abbafb420e9034a1a4a8

Russell Belfer 2012-03-02T15:57:06

Fixes for merge of filters branch