[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into shr/ unstable

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Mar  9 19:52:36 2010 +0100

Merge remote branch 'origin/org.openembedded.dev' into shr/unstable

Conflicts:
	recipes/linux/linux-davinci_git.bb

---