merge of '2862048e0d5216ac90156a012c86db94c23d2742'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:11 +0000 (19:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:11 +0000 (19:02 +0000)
commitda52b3030fdab75fa015b9a4c7548ce391b54b35
treef2755f96e4ceab506f7b192191e16f37da47cf4b
parent72b5357866d97d79131ab96fea5cdd7d00ae29c9
parent9d42c6d52697e45545f2a83dd014278c038f75ca
Merge ... '2862048e0d5216ac90156a012c86db94c23d2742'
     and '42eff26099cde8822773944e3b244f74387ef7cc'