[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Dec  4 11:25:01 2009 +0100

Merge remote branch 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5

Conflicts:
	conf/distro/include/angstrom-2008-preferred-versions.inc
	conf/distro/include/preferred-xorg-versions-X11R7.5.inc
	recipes/xorg-driver/xf86-input-evdev_2.3.0.bb
	recipes/xorg-font/encodings_1.0.3.bb
	recipes/xorg-font/font-adobe-100dpi_1.0.1.bb
	recipes/xorg-font/font-adobe-75dpi_1.0.1.bb
	recipes/xorg-font/font-adobe-utopia-100dpi_1.0.2.bb
	recipes/xorg-font/font-adobe-utopia-75dpi_1.0.2.bb
	recipes/xorg-font/font-adobe-utopia-type1_1.0.2.bb
	recipes/xorg-font/font-alias_1.0.2.bb
	recipes/xorg-font/font-arabic-misc_1.0.1.bb
	recipes/xorg-font/font-bh-100dpi_1.0.1.bb
	recipes/xorg-font/font-bh-75dpi_1.0.1.bb
	recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.1.bb
	recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.1.bb
	recipes/xorg-font/font-bh-ttf_1.0.1.bb
	recipes/xorg-font/font-bh-type1_1.0.1.bb
	recipes/xorg-font/font-bitstream-100dpi_1.0.1.bb
	recipes/xorg-font/font-bitstream-75dpi_1.0.1.bb
	recipes/xorg-font/font-bitstream-speedo_1.0.1.bb
	recipes/xorg-font/font-bitstream-type1_1.0.1.bb
	recipes/xorg-font/font-cronyx-cyrillic_1.0.1.bb
	recipes/xorg-font/font-cursor-misc_1.0.1.bb
	recipes/xorg-font/font-daewoo-misc_1.0.1.bb
	recipes/xorg-font/font-dec-misc_1.0.1.bb
	recipes/xorg-font/font-ibm-type1_1.0.1.bb
	recipes/xorg-font/font-isas-misc_1.0.1.bb
	recipes/xorg-font/font-jis-misc_1.0.1.bb
	recipes/xorg-font/font-micro-misc_1.0.1.bb
	recipes/xorg-font/font-misc-cyrillic_1.0.1.bb
	recipes/xorg-font/font-misc-ethiopic_1.0.1.bb
	recipes/xorg-font/font-misc-meltho_1.0.1.bb
	recipes/xorg-font/font-mutt-misc_1.0.1.bb
	recipes/xorg-font/font-schumacher-misc_1.1.0.bb
	recipes/xorg-font/font-screen-cyrillic_1.0.2.bb
	recipes/xorg-font/font-sony-misc_1.0.1.bb
	recipes/xorg-font/font-sun-misc_1.0.1.bb
	recipes/xorg-font/font-util-native_1.1.1.bb
	recipes/xorg-font/font-util_1.1.1.bb
	recipes/xorg-font/font-winitzki-cyrillic_1.0.1.bb
	recipes/xorg-font/font-xfree86-type1_1.0.2.bb
	recipes/xorg-font/xorg-font-common.inc

---