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

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 8ce61d819ffbfcb5e000c1a58cfab9a4aa5f17b1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8ce61d819ffbfcb5e000c1a58cfab9a4aa5f17b1

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Jan 15 01:14:45 2010 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

Conflicts:
	recipes/serial-utils/pty-forward-native.bb
	recipes/serial-utils/serial-forward.bb

---