merge of 61486dc9a1b23e7088c746a1a9d6c6199cc8f5a5
authorRod Whitby <rod@whitby.id.au>
Sun, 8 Jan 2006 00:45:28 +0000 (00:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:45:28 +0000 (00:45 +0000)
     and b1dcd027693e6239eac9bebf42988acd618f1125


Trivial merge