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)
     and '87e7a524e83ef079ad7118cfaeac8180944da275'


Trivial merge