From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 4 Dec 2010 03:42:03 +0000 (-0800)
Subject: Merge remote branch 'origin/release-2010.12'
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0fe619acf5f00f42bb3444b77a0660b465b17c1;p=openembedded.git

Merge remote branch 'origin/release-2010.12'

Conflicts:
	conf/distro/include/kaeilos-2009-preferred-versions.inc
	recipes/busybox/busybox-1.18.0/B921600.patch
	recipes/busybox/busybox-1.18.0/defconfig
	recipes/busybox/busybox-1.18.0/fdisk_nios2.patch
	recipes/busybox/busybox-1.18.0/udhcpc-fix-nfsroot.patch
	recipes/busybox/busybox-1.18.0/udhcpscript.patch
	recipes/linux/linux_2.6.36.bb

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

d0fe619acf5f00f42bb3444b77a0660b465b17c1