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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Apr  1 13:20:01 2010 +0200

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

Conflicts:
	recipes/shr/e-wm-config-illume-shr_git.bb
	recipes/shr/e-wm-config-illume2-shr_git.bb

---