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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Dec 14 23:45:04 2009 +0100

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

---