merge of '2690e38f2d62247f95e1eb15274c21741004c97e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 12:04:29 +0000 (12:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 12:04:29 +0000 (12:04 +0000)
commit13768a336a8a1d956b828007d4e29b7cd9849c84
treed3865b2a77bf29f74678e1d8bbc8b6c08c5ee33b
parentf569da00fa19ad423e53305613c983591f37a4a4
parent1f149ef1d7e7f73f95bd7b463855f765328e6912
Merge ... '2690e38f2d62247f95e1eb15274c21741004c97e'
     and '87e7a524e83ef079ad7118cfaeac8180944da275'