merge of '23b499709c194edb8a59cac3432c10a63e6a952d'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 9 Jan 2007 20:07:40 +0000 (20:07 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 9 Jan 2007 20:07:40 +0000 (20:07 +0000)
     and '936fcb645dcae65ff05db814bd104083a0194fb0'


Trivial merge