Merge remote branch 'remotes/elrond/dev/init'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Jul 2011 20:48:49 +0000 (15:48 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Jul 2011 20:48:49 +0000 (15:48 -0500)

Trivial merge