Merge pull request #793 from jimfcarroll/fix-12580
authorjimfcarroll <thecarrolls@jiminger.com>
Wed, 21 Mar 2012 21:05:29 +0000 (14:05 -0700)
committerjimfcarroll <thecarrolls@jiminger.com>
Wed, 21 Mar 2012 21:05:29 +0000 (14:05 -0700)
Yet Another Deadlock fix. closes 12580


Trivial merge