merge of '311c27bb2d9d680e9754b77c40e1c0c4c196911c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:37:47 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:37:47 +0000 (16:37 +0000)
commita95625e2f04d85730bb832aace358e86265cef20
treebad3320ecca53f757b2de7f792ad754142085d13
parent6314637e4ece937e6f347ebb3315d58ee3494fef
parent1650a1f5030b5206eb259c1c7a879cdfb86d2e2d
Merge ... '311c27bb2d9d680e9754b77c40e1c0c4c196911c'
     and '5ad501585ca9cad8ed8d9a9c79580304a6f71a49'