merge mfs changes
commitd2663d8754cae7384c6a9fe580eef22296cc11c0
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Fri, 13 Sep 2013 16:02:09 +0000 (13 18:02 +0200)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Fri, 13 Sep 2013 16:02:09 +0000 (13 18:02 +0200)
treead5a8d8f43f3cf586ff85e826edff9051446a390
parentcc8044e9a3afa3a0f66130eb42e516665fc05748
parentfd7dbbb4670bffe18140ce7413fe938ea6268cc5
merge mfs changes