merge of '3e30fd93324363fef5804864bf39efef2522563b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 14 Feb 2008 14:07:31 +0000 (14:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 14 Feb 2008 14:07:31 +0000 (14:07 +0000)
commitba35fef8dce2a92910357e9cd334c8adc5cd1cc7
tree09ca6069d920e4c90e5e650bccb1304c0afa05da
parentbf10ce1f71db27c63a75e290c3c391bf221a70f6
parent0295c74a2d824a498c2d955c7fb0c72419a59cbb
Merge ... '3e30fd93324363fef5804864bf39efef2522563b'
     and 'ae4463d55d31b1c6881f1191586007da010c79c8'