merge of 339acd78a0048095d63604cf15366e8bc0e87d60
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Dec 2005 18:21:27 +0000 (18:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 18:21:27 +0000 (18:21 +0000)
     and 5b5b8b71487defdcc39752dd5f29638b15be8a3d


Trivial merge