Merge commit 'dkg/master'
authorMatt Goins <mjgoins@openflows.com>
Sat, 21 Jun 2008 18:59:24 +0000 (14:59 -0400)
committerMatt Goins <mjgoins@openflows.com>
Sat, 21 Jun 2008 18:59:24 +0000 (14:59 -0400)

Trivial merge