merge of '0a57d791817bb802f8d5d76a1f72267f1b8f3824'
authorKoen Kooi <koen@openembedded.org>
Mon, 12 Nov 2007 20:14:06 +0000 (20:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 12 Nov 2007 20:14:06 +0000 (20:14 +0000)
commit71e28c80819f5c82d959a9e5e27ef084246ace13
tree2833994ba218f520629d36461ff944fc51bccaef
parent60c8c34379798456084666a86579b553f7798eed
parent508bd1ece030e182d3c47c530555f3b4f6f726fc
Merge ... '0a57d791817bb802f8d5d76a1f72267f1b8f3824'
     and '60523827594e8dff880897c63c20ce4b5515bb3e'