merge of '2b33aa7e14fb73dac68d3c76e023f7c50ddf272b'
authorMatt Reimer <mattjreimer@gmail.com>
Mon, 27 Nov 2006 21:35:56 +0000 (21:35 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Mon, 27 Nov 2006 21:35:56 +0000 (21:35 +0000)
     and '8fd787cd0451416efde2b7d17050c5337130fe3c'


Trivial merge