From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 17 Oct 2005 23:15:06 +0000 (+0000)
Subject: merge of 1a138e228b9a27d00855a6c27775e9b2430220a2
X-Git-Tag: Release-2010-05/1~9453^2~3235^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cfbec017c980b26142ec8494e0bf321256bb332;p=openembedded.git

merge of 1a138e228b9a27d00855a6c27775e9b2430220a2
     and b7f6ccdd490a93fd12ab881d78d03c39cc31ecba
---

8cfbec017c980b26142ec8494e0bf321256bb332