Merge branch 'vendor/GDTOA'
authorPeter Avalos <pavalos@theshell.com>
Sat, 24 Jan 2009 17:06:28 +0000 (12:06 -0500)
committerPeter Avalos <pavalos@theshell.com>
Sat, 24 Jan 2009 17:06:28 +0000 (12:06 -0500)

Trivial merge