merge of 982bd6dee5de1d8614e7b6dca3d8ff2864d9be56
authorKoen Kooi <koen@openembedded.org>
Sat, 27 Aug 2005 18:13:49 +0000 (18:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 Aug 2005 18:13:49 +0000 (18:13 +0000)
     and afe5b334025f7a057bb991cd4da6a637f11a8310


Trivial merge