Merge remote branch 'remotes/elrond/dev/init'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 26 Jul 2011 04:23:58 +0000 (23:23 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 26 Jul 2011 04:23:58 +0000 (23:23 -0500)

Trivial merge