Merge remote branch 'origin/master' into osgi

This commit is contained in:
Roman Roelofsen 2010-06-16 00:50:57 +02:00
commit 301b33d760

Diff content is not available