Merge branch 'oo-dispatcher'
Chris Nehren [Sun, 4 Sep 2011 05:59:54 +0000 (01:59 -0400)]

Trivial merge