merge of 8e33eeb17bbd49f662114dd190c76438c7dd9d8e
authorRene Wagner <rw@handhelds.org>
Sun, 12 Mar 2006 18:09:25 +0000 (18:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Mar 2006 18:09:25 +0000 (18:09 +0000)
     and 975abe26ddcb43a81f933b3a1980cc389ec313dc


Trivial merge