merge of '0e25c8665bca3c8d9e7c99e4432c9ce60811994c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 4 Sep 2007 10:00:44 +0000 (10:00 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 4 Sep 2007 10:00:44 +0000 (10:00 +0000)
commit617dadee6dbd649099783a4224f706b3d5fe657c
tree039e93e5b59fb5bf508d0d7654e97501cafc58e6
parent188444b135f86d16839d2852e7bff5228dd1d773
parent093291a6d79b3e6228981b6a9dbc8cc31af01573
Merge ... '0e25c8665bca3c8d9e7c99e4432c9ce60811994c'
     and '72c178b1440b044fcf6acdbb1cd21921f80d5b9b'