From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 21 Jan 2006 00:20:28 +0000 (+0000)
Subject: merge of 7bae67cd8daef4d5a9307341c2352670e31ca3b5
X-Git-Tag: Release-2010-05/1~9453^2~2608^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72a69325e8f9989ad0efc7b42f232e2f7baa6e6b;p=openembedded.git

merge of 7bae67cd8daef4d5a9307341c2352670e31ca3b5
     and afe451e4a4ab3d7a152374af3d545c3f4002a864
---

72a69325e8f9989ad0efc7b42f232e2f7baa6e6b