[oe-commits] Sebastian Spaeth : Merge branch 'shr/merge' of ssh+git://git at git. openembedded.net/openembedded into shr/merge

[git version control]

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

Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Fri Nov 13 14:50:54 2009 +0100

Merge branch 'shr/merge' of ssh+git://git@git.openembedded.net/openembedded into shr/merge

---