From: PHO <pho@cielonegro.org>
Date: Thu, 23 Feb 2012 09:57:31 +0000 (+0900)
Subject: Fix conflicts
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=104962c00b3b18e657e4bdeb7a37145d338cffbf;hp=104962c00b3b18e657e4bdeb7a37145d338cffbf;p=build-hc-pkg.git

Fix conflicts
---