From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 23 Jul 2006 14:29:11 +0000 (+0000)
Subject: merge of af8709007f32abecb4c0405405d92fb4c571c39f
X-Git-Tag: Release-2010-05/1~9453^2~1195
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1647e2b6219f5214ea7cb7a363f789e897528909;p=openembedded.git

merge of af8709007f32abecb4c0405405d92fb4c571c39f
     and ba784a232849fe4344908f828cb7e341d36fe24c
---

1647e2b6219f5214ea7cb7a363f789e897528909