merge of 3392085b60cfb0f161a99c870ef6f89a6e93fdba
authorRod Whitby <rod@whitby.id.au>
Mon, 10 Apr 2006 22:30:15 +0000 (22:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Apr 2006 22:30:15 +0000 (22:30 +0000)
     and 4c9177abc1e90522db01ceaed6de73ac1d5c0800


Trivial merge