merge of '2cd7eb1d99944ff730eef92a2d7c01e695a59c04'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 16:29:03 +0000 (16:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 16:29:03 +0000 (16:29 +0000)
commit73dc961f989c929ab7d4812bff1ae1bed174e20e
tree54b200dfc750e0ad512d64656d51c513bba5c662
parentbc8cd4658c091b17e7f9ca814a3f495741aa4f99
parentbccc0c67f2d14c3aeaaff7eb014b082489db96c4
Merge ... '2cd7eb1d99944ff730eef92a2d7c01e695a59c04'
     and 'fe8b28a7f3024d34b8b9f58aa0fd46de16f7d5ce'