merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Dec 2005 12:05:06 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 12:05:06 +0000 (12:05 +0000)
commitd12338905b7ac84bab70ecf0f4e3d7f704c7fe99
treea79833800a6becc79cbde639ea4f240649f3345e
parentc01a09f6a7c80d4794f9ad75b92032c4fda9fcc5
parent238252253ec0eab2fc8fef9843596a4ea3e8fa7f
merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
     and 5c447cd90d49ff7228679b71f67a78e1a48e10d7