merge of '1d9f268bc89239825562b058da39c3adca103c95'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 31 Mar 2007 05:00:12 +0000 (05:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 31 Mar 2007 05:00:12 +0000 (05:00 +0000)
     and '3ab40bd75c45a4d18edae9d2a5215c0bbf6882b9'


Trivial merge