[oe-commits] Leon Woestenberg : Merge branch 'likewise/nios2' of git at git.openembedded. org:openembedded into likewise/nios2

[git version control]

Module: openembedded.git
Branch: refs/remotes/origin/likewise/nios2
Commit: 127101eaa412bd763881f53d5eb758ccf7c237e4
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=127101eaa412bd763881f53d5eb758ccf7c237e4

Author: Leon Woestenberg <leon at sidebranch.com>
Date:   Tue Nov 24 13:50:46 2009 +0100

Merge branch 'likewise/nios2' of git at git.openembedded.org:openembedded into likewise/nios2

Conflicts:
	recipes/uclibc/uclibc.inc

Signed-off-by: Leon Woestenberg <leon at sidebranch.com>

---