merge of 487e52f30ac1424e4299105affc248ed1bcb625e
authorKoen Kooi <koen@openembedded.org>
Tue, 25 Apr 2006 14:07:26 +0000 (14:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 14:07:26 +0000 (14:07 +0000)
commite43eaa96d2faef4cd42fa8d4891d753bd43b94a5
tree508dcbd9e54b432f1091c23f17092a80913a88e1
parent18c20d6141c5c7dfe9c3e8e09378e816b9cb2147
parentaf72986b4e3099aef8678286fb5e498d542a6b13
merge of 487e52f30ac1424e4299105affc248ed1bcb625e
     and 92f1863582beb464976477bbff8bf4941acbc8f1