merge of '4a47675ba44186490e7922a2cf7a5d1385cb2a82'
authorMatt Reimer <mattjreimer@gmail.com>
Thu, 22 Mar 2007 02:54:08 +0000 (02:54 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Thu, 22 Mar 2007 02:54:08 +0000 (02:54 +0000)
     and '6cbcdc4512266e3a289c8655a4f25da2fcd50593'


Trivial merge