merge of 8c9119306b7c5e40fc88a0a35736702a0c1e03bc
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 13 Jan 2006 00:38:16 +0000 (00:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 00:38:16 +0000 (00:38 +0000)
     and a7c529e1ce5036ae5fa22e574e755f38d0b88a8e


Trivial merge