merge of '331c796786f820575978cca1b06ff1676cbbfb45'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Sep 2006 20:11:40 +0000 (20:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Sep 2006 20:11:40 +0000 (20:11 +0000)
commit1b0ec1eeed007033b51b2933905bfb7aa335c2c2
tree8cc9c0600f8e3d70f5f9796616f9d72572bd0bc7
parent3991d9efe92fa183899a15fdf928582f53044bbe
parentc2255f38d6a6c4a2bab571ab2cf547d7493891cd
Merge ... '331c796786f820575978cca1b06ff1676cbbfb45'
     and '727e71965e5388b1cca1ae5bda4b54f7cdd317b7'