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

Trivial merge