merge of '706cfac4c4f36e78c23b5d62cd653b2820091c04'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jul 2007 15:46:18 +0000 (15:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jul 2007 15:46:18 +0000 (15:46 +0000)
     and 'c293cc4e6d77cae86deaaf6f134d6640daa2f04c'


Trivial merge