merge of 7cf02eba7575b6840c1fb5d91671c51d7ce49303
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 10:58:28 +0000 (10:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 10:58:28 +0000 (10:58 +0000)
     and e6da98bac7d686d3e88211061aa2804f4f75c109


Trivial merge