merge of '7444bbc2e9419bb40174ad81518b1c056919b98a'
authorJustin Patrin <papercrane@gmail.com>
Sat, 27 Jan 2007 21:42:03 +0000 (21:42 +0000)
committerJustin Patrin <papercrane@gmail.com>
Sat, 27 Jan 2007 21:42:03 +0000 (21:42 +0000)
     and '79b308f56000e053b195ea2c00c2b186b2317699'


Trivial merge