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

[git version control]

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

Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Fri Dec  4 09:51:32 2009 +0100

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

Conflicts:
	recipes/librsvg/librsvg-native_2.26.0.bb

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

---