merge of '1fc9d550468a28c01730e8075da9eb6354279e82'
authorKoen Kooi <koen@openembedded.org>
Wed, 13 Dec 2006 22:22:36 +0000 (22:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 13 Dec 2006 22:22:36 +0000 (22:22 +0000)
     and '7dc5c6145f5a9f64aba3521e24e1a0b1ff7f0e0e'


Trivial merge