From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Tue, 21 Nov 2006 11:49:59 +0000 (+0000)
Subject: merge of 83d79b5cd4fd20054c665e25366f4ee45f3b681f
X-Git-Tag: Release-2010-05/1~9453^2~358^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6da5898f94a55b466e18e99f682a89e76cf21015;p=openembedded.git

merge of 83d79b5cd4fd20054c665e25366f4ee45f3b681f
     and 9833bd070799894b4c6befebea43d27d44a56e2a
---

6da5898f94a55b466e18e99f682a89e76cf21015