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)
commitd4c9f9259b04169de83f9528026d8921c5127b79
treece42643c37f7b4283a3f34e12d7d9c124bae8622
parentea8c70b53b4ce9fea288bc7c255cd16d29a1ac18
parent8c9b796622e3705746615f88e52a52b1c90f6ed2
Merge ... '110c6ec488c63036fe1cb9a1e304bfb935b57bca'
     and '60181dbea7f819472034ab00db51dac31fd65723'