[SCM] ices2/master: Fix merge conflicts.

[unit193-guest at users.alioth.debian.org]

Imported Upstream version 2.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 513431f21e1859f7e4877df33e1d6fc8669926e1
X-Git-Newrev: 1866767e267b6276d96713a8f5ae8a5f3f3b76d2

The following commit has been merged in the master branch:
commit 997c9f7fb5ace4bc3b370a2f76d1c59eff2660ea
Merge: 513431f21e1859f7e4877df33e1d6fc8669926e1 dfed43313c16ec701ca9593b9a530b341b9dbdf8
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Tue Oct 28 18:47:37 2014 -0400

    Fix merge conflicts.


-- 
ices2 packaging