merge of 34851fe4aecd36f7bfae3317e45d98f58bb6bc59
authorMatt Reimer <mattjreimer@gmail.com>
Wed, 15 Feb 2006 00:50:07 +0000 (00:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 15 Feb 2006 00:50:07 +0000 (00:50 +0000)
     and 37212ffa007b0b42f88d05068588f8de0542e356


Trivial merge