merge of '8ee5fde10ca72ef93660e0426265e0ddb8fd2ece'
authorMatt Reimer <mattjreimer@gmail.com>
Tue, 30 Jan 2007 22:03:44 +0000 (22:03 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Tue, 30 Jan 2007 22:03:44 +0000 (22:03 +0000)
     and 'd71be2cdd408ee537bcb51e66ff0eced4bf31af7'


Trivial merge