merge of 'ad36a7c0dc09029ac7c1a503d76ef1f5ca0600e0'
authorKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 19:27:16 +0000 (19:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 19:27:16 +0000 (19:27 +0000)
commit0f9387ad289cf63da20ad7fdabe46b34f38543d6
tree83dc61f17374574d40a11dd377e4619082f8b6e6
parentf2d5c71043966804fa04a332703503e5dd65bf90
parentdc4bab052827c5b88109474ba8e78d8059d6a009
Merge ... 'ad36a7c0dc09029ac7c1a503d76ef1f5ca0600e0'
     and 'dc872c264d1153f23f3441b4facbe53338c1f142'