merge mmcm: A recent branch had a .DS_Store file in the root.
merge mmcm: A recent branch had a .DS_Store file in the root.

https://code.launchpad.net/~mmcm/akiban-server/no-dot-ds-store/+merge/101090
ngaut/sql-layer,ngaut/sql-layer,qiuyesuifeng/sql-layer,wfxiang08/sql-layer-1,wfxiang08/sql-layer-1,ngaut/sql-layer,jaytaylor/sql-layer,shunwang/sql-layer-1,shunwang/sql-layer-1,ngaut/sql-layer,qiuyesuifeng/sql-layer,relateiq/sql-layer,qiuyesuifeng/sql-layer,wfxiang08/sql-layer-1,shunwang/sql-layer-1,relateiq/sql-layer,jaytaylor/sql-layer,relateiq/sql-layer,shunwang/sql-layer-1,wfxiang08/sql-layer-1,jaytaylor/sql-layer,jaytaylor/sql-layer,relateiq/sql-layer,qiuyesuifeng/sql-layer