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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Apr  9 21:43:59 2010 +0200

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

Conflicts:
	recipes/freesmartphone/msmcommd_git.bb

---