From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 12 Jan 2006 22:21:23 +0000 (+0000)
Subject: merge of 1af98528cc819da70e3ec70148b0697072cec68a
X-Git-Tag: Release-2010-05/1~9453^2~2681
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bb85d3aeddb8a248cbab1e57efdc221fff15082;p=openembedded.git

merge of 1af98528cc819da70e3ec70148b0697072cec68a
     and dbca6f4c143066fafe7af7445da627277276ea33
---

6bb85d3aeddb8a248cbab1e57efdc221fff15082