merge of '011ea838b318e8da2d5c0f2a9d9a8a41c2096ceb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 19:55:06 +0000 (19:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 19:55:06 +0000 (19:55 +0000)
commitc9f6c8a89dbbfd4178d8c097f4f91a344e71d6f0
tree6bb0475d4ffd0b57faa90b04b2f96cf16e62d69f
parent4209bffde9b7dc5044a0b293873347fe5734e908
parent541b9cb7c4a88f951a82b3fdadbd1e04806679be
Merge ... '011ea838b318e8da2d5c0f2a9d9a8a41c2096ceb'
     and 'ed0aa1600b77c27c385bdb61f6e9728aa499015b'