merge of '7d07d609f8af621d346ce23b17396f9c6c2c9c72'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 1 Apr 2007 14:35:21 +0000 (14:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 1 Apr 2007 14:35:21 +0000 (14:35 +0000)
commitf6886c0f815a0cec5691308d14ccdb53abcdaee6
treec4541fa524a9ab14132cb39e3879fde534e25c4b
parent5169569841cb1c92c6f47ce73aaaaff63a95d76a
parentc736d28d5087860369a744e2ed10b8e92610fe97
Merge ... '7d07d609f8af621d346ce23b17396f9c6c2c9c72'
     and 'c753fde1cef923f9f49b724093483f377f7b72d0'