merge of '15abe433106a3416f43fe1507eb0032a960434bb'
authorDaniel Willmann <daniel@totalueberwachung.de>
Thu, 17 Jan 2008 19:23:03 +0000 (19:23 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Thu, 17 Jan 2008 19:23:03 +0000 (19:23 +0000)
commit5f89da2c9521b9bff73a34b933929c1767c454ae
treea6eb507e8e20dbbc500655ea515ece4cb5500bd9
parent1bf5c3346ac395825d49f895922a61bcdbb238e5
parent3c378f37f55ee00c41fce4897f8a09cb51b59f94
Merge ... '15abe433106a3416f43fe1507eb0032a960434bb'
     and '2538d8c9c6f9647baba548394a1e20a2e4467a19'