merge of '3ad0844ce9d5f38938193e537eef14f3eedc5aaa'
authorHolger Freyther <zecke@selfish.org>
Mon, 17 Mar 2008 14:19:29 +0000 (14:19 +0000)
committerHolger Freyther <zecke@selfish.org>
Mon, 17 Mar 2008 14:19:29 +0000 (14:19 +0000)
commit6c4f924d701e245410cef139d29eba10dd058194
tree6fbea9b1593b260cfb316acd645f216de039162d
parenta39deb9f381a529332a328ee617d1160e35db5c2
parent71a43ce3393df9b1380d47d36335a920a5c41461
Merge ... '3ad0844ce9d5f38938193e537eef14f3eedc5aaa'
     and 'c6487ccb0affa59758f32bd6af992ddd0508d2b5'