merge of '110c6ec488c63036fe1cb9a1e304bfb935b57bca'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Sep 2007 17:28:01 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Sep 2007 17:28:01 +0000 (17:28 +0000)
     and '60181dbea7f819472034ab00db51dac31fd65723'


Trivial merge