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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sun Dec 20 11:06:12 2009 +0100

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

Conflicts:
	recipes/openbsc/openbsc_git.bb
	recipes/shr/phoneuid_git.bb

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

---