merge of 505f6e001e3fc7e1bda5010a429e1d963b181ba7
authorMichael Lauer <mickey@vanille-media.de>
Sat, 6 Aug 2005 13:27:42 +0000 (13:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Aug 2005 13:27:42 +0000 (13:27 +0000)
commita3ce4c79db53e524a3390eb8c241521cef118c87
treead950bef2b7f43ebae2dcac0788917eb80c3d396
parent84d97bb6a076f7d518d7c0e6c60e0fd080bc9923
parentaa7a853ef0e21d30e208f19c9a9a350b45224363
merge of 505f6e001e3fc7e1bda5010a429e1d963b181ba7
     and ebc68fd9ca2fd9efd955596d84e5d748bea4b8e4