merge of 'cb21251032df15f833bb72b7b562bd34e429a614'
authorKoen Kooi <koen@openembedded.org>
Sat, 20 Sep 2008 13:57:28 +0000 (13:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 20 Sep 2008 13:57:28 +0000 (13:57 +0000)
commita3ccdd71145883518348d6502cc2a7e2aa8895c8
tree982b273e231317e9a0730ce3c15608a8b23dffab
parentbab3923541bbe09c8f9f1a900fe508aadced5002
parent9373fde9796ab007908d18141783edef558eeff5
Merge ... 'cb21251032df15f833bb72b7b562bd34e429a614'
     and 'ed0945867c295509a51e1dd011326159cb251e70'