Merge remote branch 'jevinskie/master'
commit58292bb891e73bc1027eb4cc6b50fab864899f1b
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Sun, 23 Jan 2011 22:58:46 +0000 (23 17:58 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Sun, 23 Jan 2011 22:58:46 +0000 (23 17:58 -0500)
tree5568a8065de39f6f8bf1b5f5f96e3b30503ae638
parentf6fb194e59e5f08c0d50117ea4c49047449ff88a
parent3626fec3ef37e04b484ef63975f41b2fdd38dff4
Merge remote branch 'jevinskie/master'