merge of '17c1f582fb1ba7d52e6ad876c69650cdf8ea9dfb'
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Aug 2007 12:19:09 +0000 (12:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 28 Aug 2007 12:19:09 +0000 (12:19 +0000)
commit7747bd237fd7ce20419a0a3684017026696e170b
tree703c4a9fcf8872ab73fc054814b04c5298adf17e
parentca4c83415d271f647d8ce51635244a80761aadf3
parent3477a6c31b6db7ea305e2911dfe3f9c7eeadc86c
Merge ... '17c1f582fb1ba7d52e6ad876c69650cdf8ea9dfb'
     and 'd6351c7d214a7c507e680a26e7986755d049ccd2'