merge of 1a53338723a901530b07e1eac0618766e5a08768
authorRod Whitby <rod@whitby.id.au>
Fri, 2 Dec 2005 19:47:27 +0000 (19:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Dec 2005 19:47:27 +0000 (19:47 +0000)
     and 36a0db81b275e4bbad8a100cb3cb8c69c72fe476


Trivial merge