merge of 5992e9a1a1abd66e6753553c665d0e27fe718e72
authorKoen Kooi <koen@openembedded.org>
Mon, 24 Apr 2006 12:57:04 +0000 (12:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 12:57:04 +0000 (12:57 +0000)
     and eeb83bff57693c86cc75c70bfc1f74e07ce2bf72


Trivial merge