merge of '13f44cdbfe324214f1eaf83010654d1baabf59c2'
authorMatthias Hentges <oe@hentges.net>
Fri, 28 Dec 2007 14:42:59 +0000 (14:42 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 28 Dec 2007 14:42:59 +0000 (14:42 +0000)
commit31e564d9f071df9fb605197e27025eecf15dde72
tree02524bf946f56621f44ccadd7b7992834af07333
parentbe3e650d031916b132b4cef9d19e7844cca3440b
parent807d2d6d72975b2de4bc47940004f792b39b7c94
Merge ... '13f44cdbfe324214f1eaf83010654d1baabf59c2'
     and 'be0c074741a0dccdd6fa957ac43f2c44be640046'