[oe-commits] Klaus Kurzmann : 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: cda5ea4478844b3843398a91c39156538c422eda
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cda5ea4478844b3843398a91c39156538c422eda

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Wed Nov 18 09:49:47 2009 +0100

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

---