merge of ee7a6ae9f04d3b86e0a6b611e45b6380c8c337b2
authorRod Whitby <rod@whitby.id.au>
Fri, 2 Dec 2005 17:16:23 +0000 (17:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Dec 2005 17:16:23 +0000 (17:16 +0000)
     and f9c84000e93bf9f50a0ddf33a8097f22d724d95f


Trivial merge