merge of '35963985c4abdc1cadcdd1d173bfafdda771e76a'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 7 Oct 2007 10:41:47 +0000 (10:41 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 7 Oct 2007 10:41:47 +0000 (10:41 +0000)
     and 'a55621f07604998ba0394320150bcb16450bafb3'


Trivial merge