merge of '5eb9119dd09c221e6e2fefd02b9fae130166b0c8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Mar 2008 13:06:52 +0000 (13:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Mar 2008 13:06:52 +0000 (13:06 +0000)
commitdba6910e1ee25f1b66fa2bb010b8d9e4499155cc
treea82cd8da3388e8e8a155c0f1c01fb62cb3ff43dd
parent65a8a2faaae0dea454c1d6250ec32ca6250c0a5e
parent379e6441f9af24ce817cad7e433ce9a599c4188c
Merge ... '5eb9119dd09c221e6e2fefd02b9fae130166b0c8'
     and 'e4b7edf3b374a0483106a3cb0cb0f20b01315107'