merge of '0303d4291ff3297fae792050c054f118512fd08d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 5 Mar 2007 18:27:05 +0000 (18:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 5 Mar 2007 18:27:05 +0000 (18:27 +0000)
commit60ef6782f7cc9058d4ddc48e06f2b5ad23ce73fa
tree222e0af9bfe986a6a3be746ad34b178ca6985285
parent0fbcc542429722b19c5a4c6e9e83fc437c55a492
parent6ff6c7c2263c5991227ee24bea1df8ccc89073cc
Merge ... '0303d4291ff3297fae792050c054f118512fd08d'
     and 'e0d98822d68dfa24d26f2402a78adb2cb0e219c3'