merge of 2272d19a881931824c401fe7e363760ef69ee524
authorMike Westerhof <mwester@dls.net>
Sun, 26 Feb 2006 06:30:27 +0000 (06:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Feb 2006 06:30:27 +0000 (06:30 +0000)
     and ed8496500eea0b42fc1517203fc5fd315857db99


Trivial merge