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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov 19 09:10:04 2009 +0100

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

Conflicts:
	recipes/curl/curl_7.19.7.bb
	recipes/freesmartphone/fsodeviced_git.bb

---