merge of 10fda4dfb0a2f5767e4a9d988a15ebb4f4cbf79c
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 10:59:48 +0000 (10:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 10:59:48 +0000 (10:59 +0000)
     and c49f43315981d8fb19ca487c3def795abc8299cf


Trivial merge