merge of '8390c5b6b9d59cb9aaf655dbe6f2e39726610caf'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 May 2007 08:30:25 +0000 (08:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 May 2007 08:30:25 +0000 (08:30 +0000)
commite8e9bb890f435c365b64b608aa69ee08f37fb760
treecbd2977cb81517494bf2aac8a856e3e4e23f36a7
parent3a125d8470d9734d4813ad4d2b46971cf65a8b64
parent9df6b90150a759edd06afae0ea5f362650cff8cd
Merge ... '8390c5b6b9d59cb9aaf655dbe6f2e39726610caf'
     and 'e7f1b73351ab28d61011332ab47196f1dc6a1931'