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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Dec  4 12:51:40 2009 +0100

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

Conflicts:
	recipes/freesmartphone/fso-apm_git.bb

---