[oe-commits] Frans Meulenbroeks : Merge remote branch 'origin' into eFfeM/sanity

[git version control]

Module: openembedded.git
Branch: eFfeM/sanity
Commit: b41c4ca878b76b046dbd132d5231fb139a4ae29c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b41c4ca878b76b046dbd132d5231fb139a4ae29c

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Mon Mar 15 09:22:35 2010 +0100

Merge remote branch 'origin' into eFfeM/sanity

Conflicts:
	recipes/schroedinger/schroedinger_1.0.9.bb
	recipes/xorg-util/xorg-util-common.inc

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---