merge of '3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:27:38 +0000 (11:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:27:38 +0000 (11:27 +0000)
commitd9eb64a436c4ddfe30ba5454d1becd765c3cb7d5
treedb18b26b866d7c243f68c9172ef227a2183c12e0
parent0c25fa3e7098c3847f4fc3eb042b94d0e142b9b3
parentf2a42025ad4e81842fb8470b0eee1a67abfd3098
Merge ... '3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b'
     and 'dc3cf7cacd8aa259dc0e068dd6a8035ad9817f47'