merge of '23a53ef6d8b0bd12c2ad781ad96e32cf88487a76'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Jan 2007 11:50:50 +0000 (11:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Jan 2007 11:50:50 +0000 (11:50 +0000)
commitc886713bf2977f0bc0add68f44e2b21d63e03a8d
tree7a8f70bb507e5adeb194573c0a446ee47944e908
parent3a5963076c86e1c994d300dd0a439fbbda1451a0
parent0546738750a06b4ee2ffdb44fcba90565de42ae2
Merge ... '23a53ef6d8b0bd12c2ad781ad96e32cf88487a76'
     and 'bb4adcc719267cf21949b39dd8d42169fddbc6b3'