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)
Conflicts:

recipes/musicpd/mpd_0.14.2.bb

1  2 
recipes/musicpd/mpd_0.14.2.bb

Simple merge