merge of '36dc1826480be70d657adcad4878a3f6f3e9092f'
authorRobert Schuster <thebohemian@gmx.net>
Wed, 19 Dec 2007 17:24:57 +0000 (17:24 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Wed, 19 Dec 2007 17:24:57 +0000 (17:24 +0000)
commit642b1a18b2e3fbaeed7c505d29b3e1f2f5c3e5ce
tree97b6638ec3e3c53bb594d392d2e685f6f01394f9
parentffa607e773edc24b09142452a7f3824d304c9599
parent1e28dcb37d0c4e06420eb108c1d268998e2ece59
Merge ... '36dc1826480be70d657adcad4878a3f6f3e9092f'
     and '558c5b83f962e73a6166add223c6cb648a1fe2ab'