Merge branch 'master' of ivan@rabbit.mmlx.us:~/Game.git
authorunknown <Ivan Lloyd@.(none)>
Sun, 30 Jan 2011 21:56:42 +0000 (15:56 -0600)
committerunknown <Ivan Lloyd@.(none)>
Sun, 30 Jan 2011 21:56:42 +0000 (15:56 -0600)

Trivial merge