merge of '34962ef398e90928f67f478c73011580d467dd42'
authorJustin Patrin <papercrane@gmail.com>
Wed, 21 Mar 2007 19:11:00 +0000 (19:11 +0000)
committerJustin Patrin <papercrane@gmail.com>
Wed, 21 Mar 2007 19:11:00 +0000 (19:11 +0000)
     and 'b253d9dbb8096855329df47fa0e89d598c7c9fb2'


Trivial merge