merge of 21f1a5172e471fd7060a18f3684bb74205fc749b
authorRene Wagner <rw@handhelds.org>
Mon, 20 Feb 2006 21:16:27 +0000 (21:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 21:16:27 +0000 (21:16 +0000)
     and d09713477314cd3b481cf7a4b6439a0d2a85a405


Trivial merge