[oe-commits] Martin Jansa : Merge commit 'origin/org.openembedded.dev' into shr/unstable

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 7d1659d3e82c5e6942300d502f64ff872247b74c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7d1659d3e82c5e6942300d502f64ff872247b74c

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Feb  5 14:03:18 2010 +0100

Merge commit 'origin/org.openembedded.dev' into shr/unstable

Conflicts:
	recipes/linux/linux-openmoko-shr-devel_git.bb

---