merge of '190c717fcefa9f89f739dac0295c41c977c5f2da'
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Nov 2006 15:15:48 +0000 (15:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 28 Nov 2006 15:15:48 +0000 (15:15 +0000)
commitf22607c68edda356b86c5b5433c316b49546275d
tree2bc531b081893e2af3993a8ffee3a906197a1fcc
parent85fd8977a23877d01352fdbd87998a36a0bbe0ff
parent4b127550884048827753325400f10a2e9461a07b
Merge ... '190c717fcefa9f89f739dac0295c41c977c5f2da'
     and '1fb8812d36f505cfabe9ee2335441ada60e32f83'