merge of 57049c964aaa418dc6616a940358cef3ba2d9c93
authorKoen Kooi <koen@openembedded.org>
Tue, 27 Jun 2006 10:20:49 +0000 (10:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Jun 2006 10:20:49 +0000 (10:20 +0000)
commitb0dcd1651f7af41900aa976eb078245055ee6079
tree3958e2cfe20663e067f4a1c7c7fcabb3438825b6
parent17f7549bce4c19982915b60b594bc345455a5ff8
parenta58f6957f00a43e56409cd7ea4e5ed97eb7e9d20
merge of 57049c964aaa418dc6616a940358cef3ba2d9c93
     and c880d1638f21e30343870a64fdfc3dc42c537574