From c597a89e5efaf8eb9f97fccf3bdc29acb4b7132a Mon Sep 17 00:00:00 2001
From: Joao Carlos <mail@joao-carlos.com>
Date: Thu, 17 Sep 2009 00:15:57 +0300
Subject: [PATCH] Merge branches 'master' and 'matt'