merge of '8aa0a2deaca11c572f50a69143d5615291b53252'
authorKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 10:40:41 +0000 (10:40 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 10:40:41 +0000 (10:40 +0000)
commit7560299ed0f2707a38c7fb6c380aba11d3154413
tree72693231645049e477ae4b11b8c9d60ad7b342b1
parent32aea580856e66c6fedad2f1dd7246f7c1a8eee0
parenta800d35917fda559bc4b8252737f9c5aee096160
Merge ... '8aa0a2deaca11c572f50a69143d5615291b53252'
     and 'fbafee3316502a2cb328539afae729d307064ecd'