From ce7d696714e822f7e1cd4aab957a6c9607eaa327 Mon Sep 17 00:00:00 2001
From: Lasse Koskela <lasse.koskela@gmail.com>
Date: Wed, 10 Jun 2009 07:48:03 +0300
Subject: [PATCH] Merge branches 'master' and 'lassekoskela-blastr/master'