Merge commit 'dkg/master'
authorMatt Goins <mjgoins@openflows.com>
Fri, 5 Dec 2008 02:35:28 +0000 (21:35 -0500)
committerMatt Goins <mjgoins@openflows.com>
Fri, 5 Dec 2008 02:35:28 +0000 (21:35 -0500)

Trivial merge