[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: d20ff32699d2da1f5bc7cb9f1390d991e325bd99
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d20ff32699d2da1f5bc7cb9f1390d991e325bd99

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov  5 10:28:19 2009 +0100

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

---