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

[git version control]

Module: openembedded.git
Branch: shr/testing2010
Commit: 1c57b57195727420a193b523f01ce87b3a0d10ae
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1c57b57195727420a193b523f01ce87b3a0d10ae

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Mar  2 18:40:03 2010 +0100

Merge remote branch 'origin/org.openembedded.dev' into shr/unstable

Conflicts:
	recipes/linux/linux-openmoko-2.6.32_git.bb
	recipes/shr/libphone-ui-shr_git.bb

---