[oe-commits] Klaus Kurzmann : Merge branch 'fso/milestone5.5' into shr/import

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Wed Jul  1 19:29:11 2009 +0200

Merge branch 'fso/milestone5.5' into shr/import

Conflicts:	recipes/freesmartphone/frameworkd_git.bb
fix PR conflict

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

---