merge of e71cbbac1a1c86b7f928f7544426e7898a11f8a8
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Oct 2005 11:44:05 +0000 (11:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Oct 2005 11:44:05 +0000 (11:44 +0000)
     and f2e0bbc6dec992f45e0ed6f0bace32fbf6560baa


Trivial merge