merge of '1eda447bcdb08adfa9f20f565bd08e963be86a92'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:15:53 +0000 (17:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:15:53 +0000 (17:15 +0000)
commit7e904c0ca438999e88e4cd63214b64d11874c1c5
tree4a588d0f360354434f743f4a1ca143e49810ec0a
parent9e7021307a438de709cd45f474454b7d58353b66
parent65b7622c504356aa9f461ffac9536bf7b5329008
Merge ... '1eda447bcdb08adfa9f20f565bd08e963be86a92'
     and 'cd255677623e77c45c275ece38db6161300a9766'