From 4a6fe2d825fc0ad763b4c6d63035bd35deb6a1e4 Mon Sep 17 00:00:00 2001
From: gdusbabek <gdusbabek@gmail.com>
Date: Wed, 22 Dec 2010 10:31:30 -0600
Subject: [PATCH] Merge branches 'master' and 'uuid'