merge of 459e8f3f8c5df4c497dd7bbb61a777513bbbfc91
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 10:18:46 +0000 (10:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 10:18:46 +0000 (10:18 +0000)
     and 654ad23c020362def38f08a15b338176247f3029


Trivial merge