merge of 7d24213f70bee7eac546332151b9d70410532933
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Mar 2006 16:11:39 +0000 (16:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Mar 2006 16:11:39 +0000 (16:11 +0000)
     and b7901ea9b8f4b39e360431eed3b70ca36c35435a


Trivial merge