From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 29 Apr 2006 22:07:48 +0000 (+0000)
Subject: merge of 780f2c7ed7d400cab2b423113975b949051ca42c
X-Git-Tag: Release-2010-05/1~9453^2~1796
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3c05f2af07d2c0b02c74667f00d2d6045a4bb72;p=openembedded.git

merge of 780f2c7ed7d400cab2b423113975b949051ca42c
     and 8c282fac8c9d0dcbec065a43bbc12cd89384b3a2
---

a3c05f2af07d2c0b02c74667f00d2d6045a4bb72