merge of '290305d126092679b5d9b8f4f299b6dce4dd8da6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 19:48:28 +0000 (19:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 19:48:28 +0000 (19:48 +0000)
commit6044bbbbc60cffed8c5472a0cb6f2e70c2a2cd1d
tree9a00916dd683a77ea670566efbd2f028e29ca533
parent2a5fdf6434cc0bee885bf52bdf5f600e33421e39
parent2f711c565e08b3ae9553226a80456d259e5a12bb
Merge ... '290305d126092679b5d9b8f4f299b6dce4dd8da6'
     and 'dac58e411440987135799adb8235fe46a6d6e1c7'