[oe-commits] Martin Jansa : Merge branch 'shr/merge' of git.openembedded.org: openembedded into shr/merge

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov  5 09:22:01 2009 +0100

Merge branch 'shr/merge' of git.openembedded.org:openembedded into shr/merge

---