From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 4 Feb 2006 01:42:52 +0000 (+0000)
Subject: merge of 1de0fd1842b598a87e5a45127325beb9643793a4
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~5^2~9^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c8f25a194d556d79f64e7df0a47a6254507e36b;p=openembedded.git

merge of 1de0fd1842b598a87e5a45127325beb9643793a4
     and aff5a7a57c5f19ed3d9fe9c0e2cee65bbadb6041
---

0c8f25a194d556d79f64e7df0a47a6254507e36b