merge of 315a43a2834c10ffcb7b5641f22459f878a47297
authorKoen Kooi <koen@openembedded.org>
Thu, 11 May 2006 16:52:09 +0000 (16:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 16:52:09 +0000 (16:52 +0000)
     and cdafdfea115bd337ea8b144f31e6951f530615d2


Trivial merge