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)
     and 'dc872c264d1153f23f3441b4facbe53338c1f142'


Trivial merge