merge of '86dacb8c8e579fd5d42ab61a0c0f344bcf74146d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 May 2008 21:52:39 +0000 (21:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 May 2008 21:52:39 +0000 (21:52 +0000)
commit0fb268a8c03bbea4fc1f34a3b7a9ebe7a02c471d
treeccf99743568c299437bb03381b1625b8c0a838ee
parent6165473d292012b6c60308c8eb0f3604a020b046
parent66af3461a3fdf3eb7ceb76bb2a04e66be8283b8c
Merge ... '86dacb8c8e579fd5d42ab61a0c0f344bcf74146d'
     and 'd4a97f257158aba4fde91347580030110ef215bf'