From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Thu, 14 Feb 2008 10:42:04 +0000 (+0000)
Subject: merge of '6c0f3ae545f03846a2a1df3e227d38a0ec34f366'
X-Git-Tag: Release-2010-05/1~7694^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0295c74a2d824a498c2d955c7fb0c72419a59cbb;p=openembedded.git

Merge ... '6c0f3ae545f03846a2a1df3e227d38a0ec34f366'
     and 'd12fb4026285bb4fc80a8dae8cd3e9cde6a0f72a'
---

0295c74a2d824a498c2d955c7fb0c72419a59cbb