merge of '09b95864e7ee73a1de1bc720bb60f856f66e46d5'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 23 Oct 2006 15:53:09 +0000 (15:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 23 Oct 2006 15:53:09 +0000 (15:53 +0000)
commit3532378376cb307a0876d280bf02a7052c556bfb
treeb13debbbca596b1521e0fc3cc9de32ea48ab9786
parentb72b787bc0bc5af3cb31d728b54a58cf0ffc7373
parent3d23242b9787c3efbe4db9cf1477e8802d18b575
Merge ... '09b95864e7ee73a1de1bc720bb60f856f66e46d5'
     and 'f6cde9cce57b9a6d7caf712e9a7ffdf9722f0c17'