merge of '88e2766fe8aa4c69dc8688e0554e2e6d05bb9c67'
authorDaniel Willmann <daniel@totalueberwachung.de>
Mon, 7 Jan 2008 23:45:57 +0000 (23:45 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Mon, 7 Jan 2008 23:45:57 +0000 (23:45 +0000)
commit1bf5c3346ac395825d49f895922a61bcdbb238e5
treeec4dc9efef3a2abccb92bdf4312ebd80c96a40b9
parent22a6de3cdd938ecd144efec7e912cb7fa20debe6
parentbb3cd6d33b47a8aa00ad8dbef0411a7721720872
Merge ... '88e2766fe8aa4c69dc8688e0554e2e6d05bb9c67'
     and 'f556521018478109967b108bb830f8109aefbb0e'