merge of 'ccec70abe8a98a77de4b5435a375269cdd6a1879'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 8 Nov 2007 08:53:43 +0000 (08:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 8 Nov 2007 08:53:43 +0000 (08:53 +0000)
commit3cf373cf8a985d240ac7fa4b71f88c289f6f27fb
tree4ecfdb600184997e3d70af6f60f24ab47a98f07b
parent278131ed21930c2a8a67b8f8e61ae90732580039
parentd3cb49ac45579e863bec58325ffc3f2554ec84e8
Merge ... 'ccec70abe8a98a77de4b5435a375269cdd6a1879'
     and 'cf6acfd742dff1aeba853a7c85797150c678b88a'