merge of '6707ea8938041e96005d0679000abd73cf4a19f2'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 28 Mar 2007 15:33:37 +0000 (15:33 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 28 Mar 2007 15:33:37 +0000 (15:33 +0000)
     and 'e0bcd233b4b12fb5617b279912d21d48054a5500'


Trivial merge