merge of '28f2be15a1987cef44b7ffbdc930f5e483a49de4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 May 2008 00:31:27 +0000 (00:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 May 2008 00:31:27 +0000 (00:31 +0000)
commitbc23b9d8c2940b0b901be35c340faa140c4301db
tree84af88a7677c123b067a8b19175bef2707491209
parent3edc1f255e687f4c3033c13051a0cdc6b7277fc9
parent28a13646cfe91767462bd3676154ee57f0865b44
Merge ... '28f2be15a1987cef44b7ffbdc930f5e483a49de4'
     and 'b0651d742b7cf6671d07f2ab5026e017142e5166'