merge of '101e6eac19d0386458366b1121296ec77262c99b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Aug 2007 08:42:00 +0000 (08:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Aug 2007 08:42:00 +0000 (08:42 +0000)
commit6e41414105c5e7cc21c4085ba59cc349c97ee7bd
treef51101ce25be9229e0811a6b0d1eb2345508ffd9
parent024e5baced24b9369c1564229305c9f0a634e49f
parent1edebe60b72f31a2df40f4e3efba3681bc43caca
Merge ... '101e6eac19d0386458366b1121296ec77262c99b'
     and '936655d78ffbdb4fb1988bbbeb66fb1f02670494'