merge of 1836da10f903d9ee68a7255b7a5d899128f4f43c
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Dec 2005 12:01:35 +0000 (12:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Dec 2005 12:01:35 +0000 (12:01 +0000)
     and d52c3796ab80d51e4749743886263398c84dffac


Trivial merge