merge of 83195d46f6bf1906b76383eda46dabd7b3f07787
authorKoen Kooi <koen@openembedded.org>
Mon, 15 May 2006 12:57:35 +0000 (12:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 May 2006 12:57:35 +0000 (12:57 +0000)
     and e6e29b77562355b1ab3fd88dcc282b3158ae5966


Trivial merge