Merge remote branch 'remotes/elrond/idea/lazyserver'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jul 2011 00:00:58 +0000 (19:00 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jul 2011 00:00:58 +0000 (19:00 -0500)

Trivial merge