[oe-commits] Sergey Lapin : Merge branch 'org.openembedded.dev' of git at git.openembedded. net:openembedded into org.openembedded.dev

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c91a54aef8a39e7cbb2571574f56f2cf12104ff1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c91a54aef8a39e7cbb2571574f56f2cf12104ff1

Author: Sergey Lapin <slapin at ossfans.org>
Date:   Fri Jun 26 22:32:52 2009 +0400

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

Conflicts:

	recipes/musicpd/mpd_0.14.2.bb

---