merge of '4cb57a7e78a706388906290afb6ab438e669072a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Mar 2008 20:34:02 +0000 (20:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Mar 2008 20:34:02 +0000 (20:34 +0000)
commit6c0db6a8f8668b3016ffa569450042f3699f5f87
tree5f29476292b459917f16979c8015d282958d24d6
parent0b64e8f057ae4e121e68b52c1a4c2d8cd77884d8
parent987201e0b0a8380c1336888c4fbab14a95b49afa
Merge ... '4cb57a7e78a706388906290afb6ab438e669072a'
     and '6e0de74e2cca9def0790de8f3cd7446e3df6ea12'