Commit 98e3b298955557ae10d6682ea33eb8ba8a5447a5

nulltoken 2010-12-23T09:22:15

Merge branch 'master' into repo-init