merge of '2001ac2acd66ae1b7566b3830724007b6854f03f'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 10:07:42 +0000 (10:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 10:07:42 +0000 (10:07 +0000)
commit549ff14829822f4cbb415bd7b49c4af9b52bfc7b
tree10e48c4dd8aff2b80e54a5cfb0454f70a8f8d41b
parentf1eb1f8e534c755a916a7e4f38f5c1a64aab4fb0
parenta573f8a130029a1f76d43ec9a2158043e5ac2942
Merge ... '2001ac2acd66ae1b7566b3830724007b6854f03f'
     and 'a6961e05d6a31b23961267e50853355f41ab5891'