merge of 189d378741dbc7aa7eac0a92e135a36bf31167f8
authorPatrick Steiner <law@a1.net>
Tue, 19 Jul 2005 10:35:04 +0000 (10:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Jul 2005 10:35:04 +0000 (10:35 +0000)
     and 5b7b4ed789568a81492f6e5c5a179ed4a7f28d02


Trivial merge