merge of abf4a17f4b3d256e5b78049b819e1674eeef98d5
authorRod Whitby <rod@whitby.id.au>
Tue, 4 Apr 2006 21:31:48 +0000 (21:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 21:31:48 +0000 (21:31 +0000)
     and e5a38d83b512c0a632ec3bd86a9e8066a38574ce


Trivial merge