From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 21 Jan 2006 13:00:18 +0000 (+0000)
Subject: merge of 4f879e69c3075a7f71f282a926dc5d66531e0982
X-Git-Tag: Release-2010-05/1~9453^2~2600
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eacc5f0bdbab539bec95e7c494bcbad209ddd662;p=openembedded.git

merge of 4f879e69c3075a7f71f282a926dc5d66531e0982
     and eb951c998c252c9834e0f299a6d9bee237365a2d
---

eacc5f0bdbab539bec95e7c494bcbad209ddd662