[oe-commits] Michael 'Mickey' Lauer : Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev

[GIT User account]

Module: openembedded.git
Branch: mickey/org.openembedded.dev
Commit: dd53c790d6c3b19bff547755f804e5f2fccc56ed
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=dd53c790d6c3b19bff547755f804e5f2fccc56ed

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Mon Mar  2 19:09:19 2009 +0100

Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev

Conflicts:

	classes/qt4e.bbclass
	packages/bluez/bluez4_4.31.bb
	packages/mc/mc_4.6.2.bb
	packages/vte/vte.inc
	packages/vte/vte_0.16.13.bb
	packages/vte/vte_0.16.14.bb

---