From: jorgormo <jorgormo@node001.(none)>
Date: Mon, 30 Jun 2008 14:56:07 +0000 (+0200)
Subject: Merge branch 'master' into hyades
X-Git-Url: http://slack.codemaniacs.com/git/?a=commitdiff_plain;h=4ed5670572a5fd12d6303c690d0c04daccc3fd89;p=melon.git

Merge branch 'master' into hyades
---

4ed5670572a5fd12d6303c690d0c04daccc3fd89