merge of '2a95914087586c7f511061dd7404c0f44fc9ce24'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 19:54:14 +0000 (19:54 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 19:54:14 +0000 (19:54 +0000)
commitdb96081b9d6c015ec77dbdcfe122fb785abfb68c
tree431f84723c95f9828d2ccf8b5d2b5d1ba6ff3d1d
parent81ab9b94748aa8eee7c9511206c9d95d6f986719
parent79ff83371cd1be7c68d56b35e5679c4944ab3e54
Merge ... '2a95914087586c7f511061dd7404c0f44fc9ce24'
     and '595d3bb20485f41ca08f2f400d9c3a3c7106db90'