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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov 26 09:15:45 2009 +0100

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

---