merge of ef62b2555a5d30ff42544ba03d38558f139601b4
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Dec 2005 13:02:34 +0000 (13:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Dec 2005 13:02:34 +0000 (13:02 +0000)
commitf956dbb9d1e9c1c3af424e5e289051ab9009ecf4
tree1effac1e6a5c0076c67b12ba62cf76a9ac3f686e
parent6a23554f187d909d1a1eab9072e68cdfe3b57b0c
parentd27b92aaa3e609bd91464204be08877e42bb9ab6
merge of ef62b2555a5d30ff42544ba03d38558f139601b4
     and f329d6133a0f6951c95e2f6581c56a63a56a814b