merge of '98112dc48d05ba36117d1045ed0b25ac449d5c7f'
authorJustin Patrin <papercrane@gmail.com>
Sun, 21 Jan 2007 20:35:02 +0000 (20:35 +0000)
committerJustin Patrin <papercrane@gmail.com>
Sun, 21 Jan 2007 20:35:02 +0000 (20:35 +0000)
     and 'a6d3725bcd7849f3044d01c9bfa2c73dd96dfe89'


Trivial merge