From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 28 May 2006 02:38:36 +0000 (+0000)
Subject: merge of 9163a4b2aa3f51ec4fd9c17fbf7e8cacf1c0f767
X-Git-Tag: Release-2010-05/1~9453^2~1576
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3481251eddee8369eed4ab7645e45390312fd0b;p=openembedded.git

merge of 9163a4b2aa3f51ec4fd9c17fbf7e8cacf1c0f767
     and b4098f1c54899bc7168ca2c5d533fd2676462e9c
---

b3481251eddee8369eed4ab7645e45390312fd0b