merge of 1b63b991554424859234171d74c5abc6b9ba6759
authorRene Wagner <rw@handhelds.org>
Tue, 31 Jan 2006 20:34:14 +0000 (20:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 31 Jan 2006 20:34:14 +0000 (20:34 +0000)
     and af1f287266f2f111baa6945c52966396c108642b


Trivial merge