am 67d9bcdf: Only create folder if not present.

Merge commit '67d9bcdf5cfe8c2862280ea6e55c4beed05432ef' into eclair-mr2

* commit '67d9bcdf5cfe8c2862280ea6e55c4beed05432ef':
  Only create folder if not present.