merge of '2094880cffb42e8376e3ea9f336fb268df7af9eb'
authorMatt Reimer <mattjreimer@gmail.com>
Sat, 20 Jan 2007 23:02:09 +0000 (23:02 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Sat, 20 Jan 2007 23:02:09 +0000 (23:02 +0000)
     and '8200a5887c79d2960226fc58003767b7538f8c41'


Trivial merge