From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 31 Aug 2005 18:28:22 +0000 (+0000)
Subject: merge of 06f3983d464e263927b50412d18a25426951bf5c
X-Git-Tag: Release-2010-05/1~9453^2~3729
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1dc05985df7c60cfb7ace030286bd8e390975b8;p=openembedded.git

merge of 06f3983d464e263927b50412d18a25426951bf5c
     and 79ddb5aadb42e7555b58cfa11fd3ffd10d698719
---

c1dc05985df7c60cfb7ace030286bd8e390975b8