Merge remote branch 'origin/release-2010.12'
authorKhem Raj <raj.khem@gmail.com>
Sat, 4 Dec 2010 03:42:03 +0000 (19:42 -0800)
committerKhem Raj <raj.khem@gmail.com>
Sat, 4 Dec 2010 03:42:03 +0000 (19:42 -0800)
commitd0fe619acf5f00f42bb3444b77a0660b465b17c1
treeab0098da5513f281860bffd22dc105e636e826c1
parenteffc276f923352dcf8b954705c0535fdca35cd5e
parentdec3967e155d4dd7b3570802e4ba1f3863c5408b
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>