merge of b1dcd027693e6239eac9bebf42988acd618f1125
authorKoen Kooi <koen@openembedded.org>
Sun, 8 Jan 2006 00:51:43 +0000 (00:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:51:43 +0000 (00:51 +0000)
     and f7eb46be5e3e57b355a45440ee6c36224be527df


Trivial merge