merge of '4291007b4bae759bf40160260fcab53e01a106d9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Sep 2007 15:50:02 +0000 (15:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Sep 2007 15:50:02 +0000 (15:50 +0000)
commite261104fb3383d7e3a73ad340adfdf11df2c961a
tree39d1d2909ee334a82867f8fb82fab5bb4322fd16
parent5c7ce206e3abebec5d3aa5ca6ff93b75ba0ed7f4
parent29b9062201720ec083d19b79203fd9668426a85e
Merge ... '4291007b4bae759bf40160260fcab53e01a106d9'
     and '98d3a1902bb89e93fa52bcf9b2493b52b64561b5'