Merge branch 'alexamdre/various-fixes' into next
authorJean Privat <jean@pryen.org>
Mon, 18 Apr 2011 16:28:23 +0000 (12:28 -0400)
committerJean Privat <jean@pryen.org>
Mon, 18 Apr 2011 16:28:32 +0000 (12:28 -0400)
commit49668cbe2bcbace9c961a24ae2878834f8b567f5
tree8e108ed8e40e221cb79826e06180264ac5e4aa5b
parent66a171274375ed86b7edaeddba77f0ee6468f5b9
parentdb387a93a0a67a256c17945427c419c6df1eb098
Merge branch 'alexamdre/various-fixes' into next