[oe-commits] Sebastian Spaeth : Merge branch 'org.openembedded.dev' into shr/unstable

[git version control]

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

Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Fri Mar  5 11:28:21 2010 +0100

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

Conflicts:
	recipes/ffalarms/ffalarms_git.bb

---