merge of e2df25d795a5c294e29cab1435249894afc5d4ef
authorRod Whitby <rod@whitby.id.au>
Tue, 21 Feb 2006 02:16:42 +0000 (02:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Feb 2006 02:16:42 +0000 (02:16 +0000)
     and f0d5ff25a7f07c6a141dcc2b5a933a3c36e93695


Trivial merge