merge of '124fe75a3b9c5f57669cab2b1f729871b642205b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Dec 2007 16:09:26 +0000 (16:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Dec 2007 16:09:26 +0000 (16:09 +0000)
commit90d3ceec768b1dc13d230d45e463178e6f4d9467
treeefd982cf60e918e6d3b1b56389bd4272116d637d
parent6961358346a4b50b6e3a982270943e239286357b
parent274ec3245555143dc86abac88d6a4fab47e809f7
Merge ... '124fe75a3b9c5f57669cab2b1f729871b642205b'
     and 'e7392dcc74d2fbda5883939005e2fad09efab025'