Merge commit '0ef9b600868e565232b9f2bb2ec7129665d4fd3e'
authorChristian Johansen <christian@gitorious.org>
Mon, 27 Jun 2011 08:16:30 +0000 (10:16 +0200)
committerChristian Johansen <christian@gitorious.org>
Mon, 27 Jun 2011 08:16:30 +0000 (10:16 +0200)
commit222797e74365154d8a655a875d05fc862159d514
treee850d28820dc0f10fa1e01ea7bcb733920b5c2fd
parent5a3b8832cfa5efe1c662e58fbde2779da772c65f
parent0ef9b600868e565232b9f2bb2ec7129665d4fd3e
Merge commit '0ef9b600868e565232b9f2bb2ec7129665d4fd3e'