From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 16 Nov 2006 03:05:30 +0000 (+0000)
Subject: merge of 77597089ce5ed314082981a36edf9b5c471b77de
X-Git-Tag: Release-2010-05/1~9453^2~463
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d11e43989c4d2041c00cae5a16f315bac99a713;p=openembedded.git

merge of 77597089ce5ed314082981a36edf9b5c471b77de
     and 9fa712a912c1f89cf7bb372e23f6ae41bf7485dc
---

0d11e43989c4d2041c00cae5a16f315bac99a713