Resolve merge conflict
authorChristian Johansen <christian@gitorious.org>
Fri, 27 May 2011 08:45:35 +0000 (10:45 +0200)
committerChristian Johansen <christian@gitorious.org>
Fri, 27 May 2011 08:45:35 +0000 (10:45 +0200)
commit2477a17e05dedcc101bddd94d836a892a3b330c1
tree22c7adc0f9bc9b1d7ebe0c2235b74bbb34c24756
parentea4d6ce31bff83a64f6c0f76def8f9431cc344ed
parent13c727b96b4040bc7932d1fbb8bc7d91497a6cc7
Resolve merge conflict