merge of 2057bca5a2cf515271e6a43d7432ecd028f5dca5
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jan 2006 23:15:28 +0000 (23:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 23:15:28 +0000 (23:15 +0000)
     and 451d8c0761e16d84691a529f9f26a9989e138fc6


Trivial merge