osgi note1
Merge branch 'master' of git@github.com:junlong/osgi.git