Squashed commit of the following:

commit 4851ea2485ddcde6331a8ed2f147a90979dd84d3
Merge: 3b39506 ec632cf
Author: MATSUNAGA Ichiro <vikke.bsd@gmail.com>
Date:   Mon Mar 18 18:05:48 2013 +0900

    Merge branch 'master' into office-pc

    Conflicts:
    	.bashrc

commit 3b39506cfcb3e8d84ed11048864ba0654d5425fd
Author: MATSUNAGA Ichiro <vikke.bsd@gmail.com>
Date:   Mon Mar 18 18:01:00 2013 +0900

    細かい調整。

commit 11b8006aa18f263e1c263d98d374fbbb9d3ff0da
Author: MATSUNAGA Ichiro <vikke.bsd@gmail.com>
Date:   Wed Jan 16 19:09:54 2013 +0900

    調整