merge of '223e77ca88fa6579d9c9b5bdb54dfa560c0088c6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Oct 2007 16:10:19 +0000 (16:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Oct 2007 16:10:19 +0000 (16:10 +0000)
     and 'c9606a6d7d837ce505119656bb9b07a84b3eb636'


Trivial merge