merge of bd60f4037ae56c6a4b161d9de8e542983c39be3c
authorMike Westerhof <mwester@dls.net>
Thu, 25 May 2006 14:28:00 +0000 (14:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 May 2006 14:28:00 +0000 (14:28 +0000)
     and eaece614d6c87d764b5caab83e36659c8131f64d


Trivial merge