From: Mike Westerhof <mwester@dls.net>
Date: Wed, 8 Mar 2006 01:15:31 +0000 (+0000)
Subject: merge of 942da6c39c03653040af872cf3d01adb58e9743a
X-Git-Tag: Release-2010-05/1~9453^2~2275
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b44b7da743362621d51e7b2f9540b32632dae9c;p=openembedded.git

merge of 942da6c39c03653040af872cf3d01adb58e9743a
     and fb01cb6b66688b09ba08a864e91986c7eca65486
---

7b44b7da743362621d51e7b2f9540b32632dae9c