From: Sergey Lapin <slapin@ossfans.org>
Date: Fri, 26 Jun 2009 18:32:52 +0000 (+0400)
Subject: Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into... 
X-Git-Tag: Release-2010-05/1~339^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c91a54aef8a39e7cbb2571574f56f2cf12104ff1;p=openembedded.git

Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

Conflicts:

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

c91a54aef8a39e7cbb2571574f56f2cf12104ff1