merge of '21f8954c91db09af224e09720b99300cf59e6c65'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 15:16:10 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 15:16:10 +0000 (15:16 +0000)
commitd50e8f348cba94854f166a0f462e587e522787ab
tree159c6671e485943e764050a1dd322a3c551f6690
parentbffa5676129e9c7ce25c0d1725c2a873ebead0e9
parent54ca0d8d122f6dce830c778a5d3b20bc96f814f3
Merge ... '21f8954c91db09af224e09720b99300cf59e6c65'
     and '854acfaab8d96ab47cd255ca4449000af3e97e99'