merge of 59ae9726b5fbfe541edc28700acbc17ed11a9672
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Apr 2006 13:09:00 +0000 (13:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 13:09:00 +0000 (13:09 +0000)
commit511f610654ce94cd5d0030e1af17a37c7c4ccffb
tree791633232cd7bc37ac1caf51b82cf84e6d0053dc
parent0c9a8e4fd40c857390d4b729aa1449d3308c32d9
parent22174f65634f38287bedc42a35c2da6c5577a807
merge of 59ae9726b5fbfe541edc28700acbc17ed11a9672
     and d93900aa884b52d778b478749eeafadb6bef3a21