[berusky2] (8 commits) ...merge fix

[Martin Stransky]

Summary of changes:

  0ca01ee... Initial commit (*)
  b8724d6... Updated to 0.6 (*)
  664ff3a... Merge branch 'master' into f16 (*)
  888f0bd... Merge branch 'f15' into f16 (*)
  8c63663... Merge branch 'master' into f16 (*)
  1a4d57a... Updated to 0.8 (*)
  802d25a... Updated to 0.9 (*)
  595369e... merge fix

(*) This commit already existed in another branch; no separate mail sent