[oe-commits] Martin Jansa : Merge branch 'org.openembedded.dev' of git.openembedded.org: openembedded into martin_jansa/srcpv

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 552c99cdb744d81818b1aada76b4b6315d68e649
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=552c99cdb744d81818b1aada76b4b6315d68e649

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Dec 23 09:12:02 2009 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

Conflicts:
	recipes/linux/linux-openmoko-2.6.32_git.bb

---