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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Nov 15 18:17:17 2009 +0100

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

---