merge of 016c6244729b3a1e0b642424fa21373b86defa21
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 5 Jul 2006 11:16:42 +0000 (11:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 11:16:42 +0000 (11:16 +0000)
     and 1f2a8090a62969a13a937ea60ea66023fb6d48e2


Trivial merge