merge of '1387039c3c15738450afefa2fce201e47d65b903'
authorJustin Patrin <papercrane@gmail.com>
Sun, 15 Jul 2007 18:22:28 +0000 (18:22 +0000)
committerJustin Patrin <papercrane@gmail.com>
Sun, 15 Jul 2007 18:22:28 +0000 (18:22 +0000)
     and '452f86f495845b7b3291db690dea35910db6e714'


Trivial merge