From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Jan 2007 17:34:59 +0000 (+0000)
Subject: merge of '597405ebde19640675e0298f9206b90ef981a115'
X-Git-Tag: Release-2010-05/1~9446
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=650cfd39f24f50e6de3009c9856197ae047d96b9;p=openembedded.git

Merge ... '597405ebde19640675e0298f9206b90ef981a115'
     and '99de646e9cb82eeb39c4f398143893df2395644f'
---

650cfd39f24f50e6de3009c9856197ae047d96b9