merge of '1550600acee1d36cd658420fd1cfaaa1e57c7127'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Apr 2007 12:17:43 +0000 (12:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Apr 2007 12:17:43 +0000 (12:17 +0000)
commit19c7601ea0a2631772029d2d2a022506e37e691c
treebdc5e7e584cb1d8dc6c09a9a773858a85c183014
parent9fda8f71205f8a71f9f0faf2fa9a538a2c1df43c
parent7807a6a7ee656b2cd702124cd227d2f1b8f39c96
Merge ... '1550600acee1d36cd658420fd1cfaaa1e57c7127'
     and 'b08044fef3b3cdf0bdd7f1a8b8c18363c0fb688f'