merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
authorDaniel Willmann <daniel@totalueberwachung.de>
Thu, 29 Nov 2007 20:10:20 +0000 (20:10 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Thu, 29 Nov 2007 20:10:20 +0000 (20:10 +0000)
commit8a2fba6940e3e07bc7613a431c99a6b7ed433588
tree0d74fe2673e0d216b0ff56dc3e8ee2e8c74fe904
parent67a1d946c02b02f76e70e792d4cfb1b0c5ada84e
parentd242abb918f10cbe2b51390c35fa311e9083f542
Merge ... '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
     and '812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee'