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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Dec 14 17:56:53 2009 +0100

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

---