[oe-commits] Martin Jansa : Merge commit 'origin/martin_jansa/srcpv' into shr/merge

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 35c39eec6ff142f22d0dab9a39fdaf9f4573cd06
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=35c39eec6ff142f22d0dab9a39fdaf9f4573cd06

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Dec 22 13:59:59 2009 +0100

Merge commit 'origin/martin_jansa/srcpv' into shr/merge

Conflicts:
	conf/machine/spitz.conf
	recipes/xorg-driver/xf86-video-glamo_git.bb

---