From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 14 Jan 2006 23:30:25 +0000 (+0000)
Subject: merge of 694969a93c9959459359c6fb14c40eb9a47b0d2f
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17fe84319301fcf629f5b47f13053e41919e98b5;p=openembedded.git

merge of 694969a93c9959459359c6fb14c40eb9a47b0d2f
     and 83739874587da7060ea036057cd64ecfc72a9727
---

17fe84319301fcf629f5b47f13053e41919e98b5