merge of 6db5a6f376383e2d73ef38fa86ae25d51699b983
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Nov 2005 21:11:57 +0000 (21:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:11:57 +0000 (21:11 +0000)
     and 9afd2dba8f4f062cb27df95849c47aa62f3441dc


Trivial merge