merge of 5d621370cfba6997b82054d8ebf82dcda659f181
authorRene Wagner <rw@handhelds.org>
Tue, 31 Jan 2006 20:39:42 +0000 (20:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 31 Jan 2006 20:39:42 +0000 (20:39 +0000)
     and c1c3a45fe3e2ec0eb7045cf3adb5dd0e4f31bbe2


Trivial merge