[oe-commits] Sebastian Spaeth : Merge commit '1275b3b16f62ce9fb4a5a94ac49bbb896564f5ce' into shr/testing2009

[git version control]

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

Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Tue Dec  1 10:04:26 2009 +0100

Merge commit '1275b3b16f62ce9fb4a5a94ac49bbb896564f5ce' into shr/testing2009

Conflicts:
	recipes/freesmartphone/fso-apm_git.bb

Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>

---