Merge commit 'dkg/master'
authorMatt Goins <mjgoins@openflows.com>
Wed, 29 Oct 2008 16:20:42 +0000 (12:20 -0400)
committerMatt Goins <mjgoins@openflows.com>
Wed, 29 Oct 2008 16:20:42 +0000 (12:20 -0400)

Trivial merge