merge of '54d41b90eb39f940315cabcc3f06e21d097472a9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 08:47:04 +0000 (08:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 08:47:04 +0000 (08:47 +0000)
     and '81fc7ef21372b525a566c7050bd637f8bff9c6b7'


Trivial merge