From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 19 Mar 2006 17:21:52 +0000 (+0000)
Subject: merge of 522ddd4c8860b47256c8a27f2b39d34c4e3b3d98
X-Git-Tag: Release-2010-05/1~9453^2~2203^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0df69e0442324d26a476bafce8c637e05675db13;p=openembedded.git

merge of 522ddd4c8860b47256c8a27f2b39d34c4e3b3d98
     and b8b3a6adaac0e7f64525ebfc53d429e599c9ea65
---

0df69e0442324d26a476bafce8c637e05675db13