Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into...
authorSergey Lapin <slapin@ossfans.org>
Fri, 26 Jun 2009 18:32:52 +0000 (22:32 +0400)
committerSergey Lapin <slapin@ossfans.org>
Fri, 26 Jun 2009 18:32:52 +0000 (22:32 +0400)
commitc91a54aef8a39e7cbb2571574f56f2cf12104ff1
treee68102d093c111affd9208b78df9c18aa837c3b8
parent323edc5ef4c3d8572ee0b4fd185ca6e3166d6b45
parent84efca2e2ad21d3d7cea68c0327f91aaf773eb67
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

Conflicts:

recipes/musicpd/mpd_0.14.2.bb
recipes/musicpd/mpd_0.14.2.bb