Merge commit 'dkg/master'
authorMatt Goins <mjgoins@openflows.com>
Fri, 31 Oct 2008 20:05:13 +0000 (16:05 -0400)
committerMatt Goins <mjgoins@openflows.com>
Fri, 31 Oct 2008 20:05:13 +0000 (16:05 -0400)

Trivial merge