From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 15 Jan 2007 17:54:45 +0000 (+0000)
Subject: merge of '8ed4f745361c3a5e363b7efaa73ba59ef8bc8031'
X-Git-Tag: Release-2010-05/1~9366^2~3^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=314d1c8d180ca954a784ab6ef51d58622ee56018;p=openembedded.git

Merge ... '8ed4f745361c3a5e363b7efaa73ba59ef8bc8031'
     and 'b713540faed8dc1c9b7eb055d91e3eaef321b79f'
---

314d1c8d180ca954a784ab6ef51d58622ee56018