merge of '63a6f6349530accb6a38bc556a6c380e3bf4d32c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 10:17:54 +0000 (10:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 10:17:54 +0000 (10:17 +0000)
commitc36ef46f7c1524d61271d0006b44c67fd66cf32b
treed712509a5ce57401a0377d278491bf6553e4738c
parent470b1df0f4f22c125995a124f70b29f1629a0885
parent8833b3f71ac2f110977581272adf74fa12e202a8
Merge ... '63a6f6349530accb6a38bc556a6c380e3bf4d32c'
     and 'fa537f6eaeafcf8b7b132dac16e7eeb204ce8a42'