merge of '0d87f3ceec0d253d684273f4ec3270544b92f192'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 10:00:39 +0000 (10:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 10:00:39 +0000 (10:00 +0000)
commitfabac8ac01ad996b47964f1bcc8e4bacb72dd8bf
tree6e02272ad829810b8cea8ad5246d62a0dcad8f4c
parent50f201b6234bd8b62e4410e60940ff70a2605852
parentc7cf564fa87a947ef5b5ff835a4d7c3ea40dc5f9
Merge ... '0d87f3ceec0d253d684273f4ec3270544b92f192'
     and '67a258d1a15721fbf7bb3dff9040d514a67383c7'