[oe-commits] Klaus Kurzmann : Merge branch 'org.openembedded.dev' into shr/merge

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Fri Jan  8 23:37:43 2010 +0100

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

Conflicts:
	recipes/freesmartphone/fsonetworkd_git.bb
	recipes/freesmartphone/fsousaged_git.bb

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---