merge of 427cbc866d445c3f4a04da2bd34020543f1e5382
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 19 Sep 2005 10:06:23 +0000 (10:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Sep 2005 10:06:23 +0000 (10:06 +0000)
     and 9081cef3c03d5ee66ba293e81a0ac15b88196e15


Trivial merge