merge of '573a418cb7f372136f03fab5334d38425e63e24c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 17:03:52 +0000 (17:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 17:03:52 +0000 (17:03 +0000)
commit72ee70604b162b8097ffa1fdc7ddd5945c69452a
tree648d041242d15feec4945705acaf516301e0a1d0
parentfd09d722ef1f14f27f833381db39ae749e8d3e6a
parent09b1ddd4ac30abd4ea8fe02cae6d9fc6ffa632d8
Merge ... '573a418cb7f372136f03fab5334d38425e63e24c'
     and '7a04a1982f0d9de387a172985cecb7af78849dc3'