merge of '1b17ea5d09e29a9b9960e907c6a56908b349ff98'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 26 Jun 2008 18:55:47 +0000 (18:55 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 26 Jun 2008 18:55:47 +0000 (18:55 +0000)
commit8dddf98f668c980faf09074ddc09a9355662655e
treea41db855796c463e25300549c761b1f9ccb122bb
parent1ed0deaac092272dfa5206a227e30adc8efd4f88
parentd9ecac1fff5c59d6d19219c77f1ef5043ea14eeb
Merge ... '1b17ea5d09e29a9b9960e907c6a56908b349ff98'
     and '60512e4106703c7bf44fad424ce575f2496d82a9'