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

[git version control]

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

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Mon Mar 15 08:34:07 2010 +0100

Merge remote branch 'origin' into eFfeM/sanity

Conflicts:
	recipes/boost/boost_1.34.1.bb
	recipes/dbus/dbus_1.3.0.bb
	recipes/libwmf/libwmf-native_0.2.8.4.bb
	recipes/libwmf/libwmf_0.2.8.4.bb

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

---