Merge remote branch 'remotes/elrond/misc/use_staticdirect'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 28 Sep 2011 22:33:03 +0000 (17:33 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 28 Sep 2011 22:33:03 +0000 (17:33 -0500)

Trivial merge