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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Jan  9 21:59:24 2010 +0100

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

Conflicts:
	recipes/freesmartphone/fsodatad_git.bb
	recipes/freesmartphone/fsogsmd_git.bb
	recipes/freesmartphone/fsotdld_git.bb

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

---