merge of '3ab428305dc18f68841dc14cd439d1a848cf72d8'
authorKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 15:21:12 +0000 (15:21 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 15:21:12 +0000 (15:21 +0000)
commit43ac05fbf0bcc8ee33fb1c7560f59bced65b0d5b
tree44456f1087821259ca07c17ed5dc7e9ed9dfab71
parent0f9536cee661c42858765c7c366342ea5a99cd27
parent568faf122afe013d9d531735da2764470d13b63d
Merge ... '3ab428305dc18f68841dc14cd439d1a848cf72d8'
     and '5d75706a2aa33529b13e82265554be6e85525ea8'