merge of '4ed305871b29e4d307ecf92b216e8016878ca38b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 11 Mar 2007 13:55:17 +0000 (13:55 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 11 Mar 2007 13:55:17 +0000 (13:55 +0000)
commitc21ed31af5d83a28b9244618db2a560face545c3
tree0e03c935ea0bf12f941bc51ce08bd2f000da882b
parent7a5edd78ca0e19b5c856ea68a26c69173c6804e7
parentcac3fe8fae9cba224e2b7ba5d402e806fe1e525c
Merge ... '4ed305871b29e4d307ecf92b216e8016878ca38b'
     and '847f1a2d783aabf61e298cb98883fbdbadb92a8f'