Merge branches 'master' and 'devel'
commitf6a9b5aa5e69a424c153f1805158c5de0546769f
authorOndrej Sukup <mimi.vx@gmail.com>
Fri, 9 Jul 2010 13:04:11 +0000 (9 15:04 +0200)
committerOndrej Sukup <mimi.vx@gmail.com>
Fri, 9 Jul 2010 13:04:11 +0000 (9 15:04 +0200)
tree1cd780bcae254a2aed0115ffc713c34cdc84ee15
parente7e3ff0c55ddc8a76667acf31e3b7507873507a5
parent856e53cde29bf41b47ff763a1597f62e9d69d094
Merge branches 'master' and 'devel'

Conflicts:
sys-fs/ntfs3g-ar/Manifest
sys-fs/ntfs3g-ar/ntfs3g-ar-2010.3.6.2.ebuild