Merge remote branch 'remotes/elrond/idea/invalidid'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 22 Jun 2011 14:52:13 +0000 (09:52 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 22 Jun 2011 14:52:13 +0000 (09:52 -0500)

Trivial merge