Merge branch 'glibmm'
commitdb9ae407625f345d9eb44d4c319992e4c41988f7
authorDaniel Knittl-Frank <knittl89+git@googlemail.com>
Thu, 14 Oct 2010 14:26:39 +0000 (14 16:26 +0200)
committerDaniel Knittl-Frank <knittl89+git@googlemail.com>
Thu, 14 Oct 2010 14:26:39 +0000 (14 16:26 +0200)
tree5cb24f508426a0a979e9ed9e0d83ef21d9ef9ff9
parent1b1dd594499a6220507382914ffacbe2910ff5ad
parentc3940f9159e0f45ed115b559873879619549e26c
Merge branch 'glibmm'