From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 8 Feb 2006 21:11:38 +0000 (+0000)
Subject: merge of c2094ddd8cbb045e11f78698e810cdeb3511237c
X-Git-Tag: Release-2010-05/1~9453^2~2387^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aaff4f4186ce0a81dad184286c9d9c055505647;p=openembedded.git

merge of c2094ddd8cbb045e11f78698e810cdeb3511237c
     and 50acc639ce5b409ac093c8ee464628c013b38b1e
---

0aaff4f4186ce0a81dad184286c9d9c055505647