From: Koen Kooi <koen@openembedded.org>
Date: Tue, 9 Jan 2007 13:04:53 +0000 (+0000)
Subject: merge of 'f48ac043926352f44cb734d06f001be6e51080ef'
X-Git-Tag: Release-2010-05/1~9420^2^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b01f303107f553bb9c1125ee5e43c4774024aa2;p=openembedded.git

Merge ... 'f48ac043926352f44cb734d06f001be6e51080ef'
     and 'fcd003eb4fa8060fd6075794e36115f1b96f4bf8'
---

0b01f303107f553bb9c1125ee5e43c4774024aa2