Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 16 Apr 2010 18:42:45 +0000 (20:42 +0200)
committerFabian Groffen <grobian@gentoo.org>
Fri, 16 Apr 2010 18:42:45 +0000 (20:42 +0200)
commit5ec7ffdfd1dd9a74592c400d7bf3efbae165393c
tree9078961431310fe3e5582b28f631a3776121b834
parent173875dcfe628018572c96cc1a0b14fcc444248c
parent8d9dcacc44cbff8945a72d8ca3dbc69e7954cfab
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/misc-functions.sh
bin/misc-functions.sh