# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1343165762 -25200
# Node ID f2a5dd14fdfff17695c4519c142748b9085253ef
# Parent  9b47effe702f5f7c66ace208911dc3d2b6a0741c# Parent  7ceaf3cd8eeac1d632463263449080c39ce4534b
Merge branch 'master' of http://github.com/edogawaconan/ecos

diff -r 9b47effe702f -r f2a5dd14fdff rc/bashrc
--- a/rc/bashrc	Wed Jul 25 04:35:37 2012 +0700
+++ b/rc/bashrc	Wed Jul 25 04:36:02 2012 +0700
@@ -19,6 +19,9 @@
 # Nuke bash-completion
 complete -r
 
+# Nuke aliases
+unalias -a
+
 _org_path="${PATH}"
 export PATH="${HOME}/.ecos_bin:${HOME}/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
 # OpenJDK in pkgsrc