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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Nov  3 10:33:23 2009 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/xorg-7.5

Conflicts:
	conf/machine/include/tune-strongarm.inc

---