From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 26 Aug 2006 14:40:57 +0000 (+0000)
Subject: merge of '295aed22d5a8b2aba3ea13993d33fdf1548e9f4a'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~59^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de16ac5ca528bba54214c4e8c145fa5b3bb21ba4;p=openembedded.git

Merge ... '295aed22d5a8b2aba3ea13993d33fdf1548e9f4a'
     and '64e3f453820277e4c667962fa8be6af48627f4fa'
---

de16ac5ca528bba54214c4e8c145fa5b3bb21ba4