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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Nov  4 13:02:31 2009 +0100

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

Conflicts:
	recipes/eject/eject_2.1.5.bb

---