From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 16 Dec 2006 11:17:29 +0000 (+0000)
Subject: merge of 8c0ee839c15de000465e4d409b592f8b6e543fb7
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f1ded325354fbe73df2d0a5af4d10c83c696919;p=openembedded.git

merge of 8c0ee839c15de000465e4d409b592f8b6e543fb7
     and c1aab6feffff3926bb5316a4a88dac41176ac4e5
---

6f1ded325354fbe73df2d0a5af4d10c83c696919