merge of 974e37be6affd939e11c5a461e60456cb8f157c0
authorRene Wagner <rw@handhelds.org>
Tue, 19 Jul 2005 15:41:39 +0000 (15:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Jul 2005 15:41:39 +0000 (15:41 +0000)
     and bc963c96596aeadb28f51b32a5991fa477af778c


Trivial merge