From: Justin Patrin <papercrane@gmail.com>
Date: Thu, 28 Jun 2007 15:06:42 +0000 (+0000)
Subject: merge of 'c80492670adbda2d61a72a0c64c1a2a873d10b51'
X-Git-Tag: Release-2010-05/1~8868^2~268^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa131f8e8c6e79b96c4b88358cf9fe256c2f0b7c;p=openembedded.git

Merge ... 'c80492670adbda2d61a72a0c64c1a2a873d10b51'
     and 'df3f0f654af4ab20778a61e050187c6f94876b9d'
---

aa131f8e8c6e79b96c4b88358cf9fe256c2f0b7c