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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Nov 18 00:25:41 2009 +0100

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

---