From: OpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Date: Fri, 12 Jan 2007 09:57:22 +0000 (+0000)
Subject: merge of '114caf859f66364143cd179bd3ae50672f123d24'
X-Git-Tag: Release-2010-05/1~9366^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4e6341f3f632c9c60531de9cf77633d0cc5ee4c;p=openembedded.git

Merge ... '114caf859f66364143cd179bd3ae50672f123d24'
     and '317ff5b9d6db289545e8b5bae03ac89c5d36024f'
---

b4e6341f3f632c9c60531de9cf77633d0cc5ee4c