merge of '74c061404accba6de9e626ef3f093a8293209def'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 25 Aug 2008 15:23:47 +0000 (15:23 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 25 Aug 2008 15:23:47 +0000 (15:23 +0000)
commit5d24a4f916c1491f5d44406a899569d2bb306874
tree87a48715d248e0425fb10996452a522f96987635
parentd90cdcf08622717e9d61bc7dd9636f61b2a32ebc
parentc3005ac1ad16e980158e41eb13f2438c35afd147
Merge ... '74c061404accba6de9e626ef3f093a8293209def'
     and 'af69f1d59affc73e1d3f65055a0ad0ff767a39e1'