merge of 462f9eb4321f7a407e426cef0645184c6c47894f
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Apr 2006 22:21:51 +0000 (22:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 22:21:51 +0000 (22:21 +0000)
commit43b298c5f2facb59e26695a290f98e1979f686c8
treef98eb5be96e2555867072519061edef9c749bb35
parent7a05d5e17437e0010a7b68de5979e6965a4fe204
parent1c91a636dfb9813b4c65c168bdef7dcc8fcaf768
merge of 462f9eb4321f7a407e426cef0645184c6c47894f
     and b2211f892717fa37d3998804bc003413e17e1393