merge of 3395fc22cc5fd1e9a7862619eb6834ffcc6860cf
authorJamie Lenehan <lenehan@twibble.org>
Fri, 26 May 2006 08:31:51 +0000 (08:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 May 2006 08:31:51 +0000 (08:31 +0000)
     and 5784b72cf5dcca71eb0811f427acc0b4748ff43a


Trivial merge