Merge commit 'dkg/master'
authorMatt Goins <mjgoins@openflows.com>
Wed, 4 Feb 2009 17:37:26 +0000 (12:37 -0500)
committerMatt Goins <mjgoins@openflows.com>
Wed, 4 Feb 2009 17:37:26 +0000 (12:37 -0500)

Trivial merge