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)
commit6a0c3e066006f6e8be669fc4af6ece8749cebe75
tree0f43609488992e0f6589fab8cfe1a626d3a79a07
parent5e0ab027e1cd26311bc4b9053cb65d5b4a003029
parent9c5a46c4cea7660dfd7ea500d1bca633c4eb8ed5
Merge ... '23b499709c194edb8a59cac3432c10a63e6a952d'
     and '936fcb645dcae65ff05db814bd104083a0194fb0'