From: Derek Young <dyoung@nslu2-linux.org>
Date: Fri, 29 Feb 2008 05:24:59 +0000 (+0000)
Subject: merge of '59cc00aa5181acfcee64ce8cec61034622bd74a4'
X-Git-Tag: Release-2010-05/1~7106^2^2~51^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e4b78b265763e2b2d0d430f62b86aab5826a48e;p=openembedded.git

Merge ... '59cc00aa5181acfcee64ce8cec61034622bd74a4'
     and 'd11d5824c76b0b1aa853d8c90b90b0eeaa632eeb'
---

1e4b78b265763e2b2d0d430f62b86aab5826a48e