merge of '755167f16f9b0fce49c13343f86891cd973fc1cb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Nov 2006 22:05:13 +0000 (22:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Nov 2006 22:05:13 +0000 (22:05 +0000)
commit6ee18ab0f2901d2d87a94e761f29d088c6e5a204
treed0ad6ed2083db46adda2b0d7dac3bf8671163dd8
parent2a03b41eb0a2aeb9e556bc088b002a1ad51f0f9e
parent313c82e3bd14e15219a0ce799e3862d64405f25b
Merge ... '755167f16f9b0fce49c13343f86891cd973fc1cb'
     and 'aaef2980a4428dedfb31b38d6894621134b0faa8'