merge of '872617c69808de974c084a129088813f22b4ca0d'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 29 Aug 2006 10:55:18 +0000 (10:55 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 29 Aug 2006 10:55:18 +0000 (10:55 +0000)
commit23649000abf97e000e0970a809307c65c5b9097a
tree3252822b34d02573890893580541993ff610e226
parent6daed4e490d91d87965db48cc288edca914ce47c
parent64a4e89e5d40475bf5c575009c09bbfcd69722a3
Merge ... '872617c69808de974c084a129088813f22b4ca0d'
     and '8f3da738b3287e652cd9b58552555515d18edc2c'