merge of 2e1b97f979cbf150f471cf8ae18f6827f8c81a56
authorRod Whitby <rod@whitby.id.au>
Tue, 24 Jan 2006 12:30:18 +0000 (12:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jan 2006 12:30:18 +0000 (12:30 +0000)
     and effe6a45a7382be0e9b737ba3d9d9a631e949577


Trivial merge